Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat(checker): http cleanup (#547)
Arthur EICHELBERGERe96ff6d12af3
diff --git a/apps/checker/go.mod b/apps/checker/go.modindex ab29bb250..12dcdf483 100644--- a/apps/checker/go.mod+++ b/apps/checker/go.mod@@ -3,6 +3,33 @@ module github.com/openstatushq/openstatus/apps/checkergo 1.21.4require (+ github.com/gin-gonic/gin v1.9.1github.com/go-chi/chi/v5 v5.0.10- github.com/google/uuid v1.4.0+)++require (+ github.com/bytedance/sonic v1.9.1 // indirect+ github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect+ github.com/gabriel-vasile/mimetype v1.4.2 // indirect+ github.com/gin-contrib/sse v0.1.0 // indirect+ github.com/go-playground/locales v0.14.1 // indirect+ github.com/go-playground/universal-translator v0.18.1 // indirect+ github.com/go-playground/validator/v10 v10.14.0 // indirect+ github.com/goccy/go-json v0.10.2 // indirect+ github.com/json-iterator/go v1.1.12 // indirect+ github.com/klauspost/cpuid/v2 v2.2.4 // indirect+ github.com/leodido/go-urn v1.2.4 // indirect+ github.com/mattn/go-isatty v0.0.19 // indirect+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect+ github.com/modern-go/reflect2 v1.0.2 // indirect+ github.com/pelletier/go-toml/v2 v2.0.8 // indirect+ github.com/twitchyliquid64/golang-asm v0.15.1 // indirect+ github.com/ugorji/go/codec v1.2.11 // indirect+ golang.org/x/arch v0.3.0 // indirect+ golang.org/x/crypto v0.9.0 // indirect+ golang.org/x/net v0.10.0 // indirect+ golang.org/x/sys v0.8.0 // indirect+ golang.org/x/text v0.9.0 // indirect+ google.golang.org/protobuf v1.30.0 // indirect+ gopkg.in/yaml.v3 v3.0.1 // indirect)diff --git a/apps/checker/go.sum b/apps/checker/go.sumindex 3bd92d34c..ddb9e8077 100644--- a/apps/checker/go.sum+++ b/apps/checker/go.sum@@ -1,4 +1,88 @@+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=+github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=+github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=+github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=+github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=+golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=diff --git a/apps/checker/main.go b/apps/checker/main.goindex 1f5e6938f..4c80a4acf 100644--- a/apps/checker/main.go+++ b/apps/checker/main.go@@ -1,149 +1,150 @@package mainimport (- "encoding/json"+ "context""fmt""net/http""os"+ "os/signal""strconv"+ "syscall"- "github.com/go-chi/chi/v5"- "github.com/go-chi/chi/v5/middleware"+ "github.com/gin-gonic/gin"+ "github.com/openstatushq/openstatus/apps/checker/request")-type InputData struct {- WorkspaceId string `json:"workspaceId"`- Url string `json:"url"`- MonitorId string `json:"monitorId"`- Method string `json:"method"`- CronTimestamp int64 `json:"cronTimestamp"`- Body string `json:"body"`- Headers []struct {- Key string `json:"key"`- Value string `json:"value"`- } `json:"headers,omitempty"`- PagesIds []string `json:"pagesIds"`- Status string `json:"status"`-}-func main() {- r := chi.NewRouter()- r.Use(middleware.Logger)+ ctx, cancel := context.WithCancel(context.Background())+ defer cancel()- // That's the new checker sending to the correct ingest endpoint- r.Post("/checker", func(w http.ResponseWriter, r *http.Request) {- if r.Header.Get("Authorization") != "Basic "+os.Getenv("CRON_SECRET") {- http.Error(w, "Unauthorized", 401)- return- }- i, err := strconv.Atoi(r.Header.Get("X-CloudTasks-TaskRetryCount"))- if err != nil {- http.Error(w, "Something went whont", 400)- return- }- // If something went wrong we only try it twice- if i > 1 {- w.WriteHeader(http.StatusOK)- w.Write([]byte("Ok"))- return- }+ done := make(chan os.Signal, 1)+ signal.Notify(done, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)- if r.Body == nil {- http.Error(w, "Please send a request body", 400)- return- }- var u InputData- region := os.Getenv("FLY_REGION")+ go func() {+ <-done+ cancel()+ }()++ // environment variables.+ flyRegion := env("FLY_REGION", "local")+ cronSecret := env("CRON_SECRET", "")- err = json.NewDecoder(r.Body).Decode(&u)+ httpClient := &http.Client{}+ defer httpClient.CloseIdleConnections()- fmt.Printf("🚀 Start checker for %+v \n", u)+ router := gin.New()+ router.POST("/checker", func(c *gin.Context) {+ ctx := c.Request.Context()+ _ = ctx // TODO: use ctx.- if err != nil {- w.Write([]byte("Ok"))- w.WriteHeader(200)+ if c.GetHeader("Authorization") != fmt.Sprintf("Basic %s", cronSecret) {+ c.JSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"})return}- client := &http.Client{}- defer client.CloseIdleConnections()+ switch i, err := strconv.Atoi(c.GetHeader("X-CloudTasks-TaskRetryCount")); {+ case err != nil:+ c.JSON(http.StatusBadRequest, gin.H{"error": "invalid retry count"})+ return+ case i > 1:+ // Why would that be OK?+ c.JSON(http.StatusOK, gin.H{"message": "ok"})+ return+ }- response, error := ping(client, u)+ var req request.CheckerRequest+ if err := c.ShouldBindJSON(&req); err != nil {+ c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request"})+ return+ }+ response, error := ping(httpClient, req)if error != nil {// Add one more retry- response, error = ping(client, u)+ response, error = ping(httpClient, req)if error != nil {sendToTinybirdNew(PingData{- Url: u.Url,- Region: region,+ URL: req.URL,+ Region: flyRegion,Message: error.Error(),- CronTimestamp: u.CronTimestamp,- Timestamp: u.CronTimestamp,- MonitorId: u.MonitorId,- WorkspaceId: u.WorkspaceId,+ CronTimestamp: req.CronTimestamp,+ Timestamp: req.CronTimestamp,+ MonitorID: req.MonitorID,+ WorkspaceID: req.WorkspaceID,})- if u.Status == "active" {+ if req.Status == "active" {updateStatus(UpdateData{- MonitorId: u.MonitorId,+ MonitorId: req.MonitorID,Status: "error",Message: error.Error(),- Region: region,+ Region: flyRegion,})}- w.Write([]byte("Ok"))- w.WriteHeader(200)++ c.JSON(http.StatusOK, gin.H{"message": "ok"})return}}if response.StatusCode < 200 || response.StatusCode >= 300 {// Add one more retry- response, error = ping(client, u)- if response.StatusCode < 200 || response.StatusCode >= 300 && u.Status == "active" {+ response, error = ping(httpClient, req)+ if response.StatusCode < 200 || response.StatusCode >= 300 && req.Status == "active" {// If the status code is not within the 200 range, we update the status to errorupdateStatus(UpdateData{- MonitorId: u.MonitorId,+ MonitorId: req.MonitorID,Status: "error",StatusCode: response.StatusCode,- Region: region,+ Region: flyRegion,})}}// If the status was error and the status code is within the 200 range, we update the status to active- if u.Status == "error" && response.StatusCode >= 200 && response.StatusCode < 300 {+ if req.Status == "error" && response.StatusCode >= 200 && response.StatusCode < 300 {// If the status was error, we update it to activeupdateStatus(UpdateData{- MonitorId: u.MonitorId,+ MonitorId: req.MonitorID,Status: "active",- Region: region,+ Region: flyRegion,StatusCode: response.StatusCode,})}// We send the data to TinybirdsendToTinybirdNew(response)- fmt.Printf("⏱️ End checker for %v with latency %d and statusCode %d", u, response.Latency, response.StatusCode)- w.Write([]byte("Ok"))- w.WriteHeader(200)+ c.JSON(http.StatusOK, gin.H{"message": "ok"})+ return+ })++ router.GET("/ping", func(c *gin.Context) {+ c.JSON(http.StatusOK, gin.H{"message": "pong", "fly_region": flyRegion})return})- r.Get("/ping", func(w http.ResponseWriter, r *http.Request) {- data := struct {- Ping string `json:"ping"`- FlyRegion string `json:"fly_region"`- }{- Ping: "pong",- FlyRegion: os.Getenv("FLY_REGION"),+ httpServer := &http.Server{+ Addr: fmt.Sprintf("0.0.0.0:%s", env("PORT", "8080")),+ Handler: router,+ }++ go func() {+ if err := httpServer.ListenAndServe(); err != nil {+ // Add structured logs.+ cancel()}+ }()- w.Header().Set("Content-Type", "application/json")- w.WriteHeader(http.StatusOK)- json.NewEncoder(w).Encode(data)+ <-ctx.Done()+ if err := httpServer.Shutdown(ctx); err != nil {+ // Add structured logs.return- })+ }+}++func env(key, fallback string) string {+ if value, ok := os.LookupEnv(key); ok {+ return value+ }- http.ListenAndServe(":8080", r)+ return fallback}diff --git a/apps/checker/ping.go b/apps/checker/ping.goindex c3cf99a1a..3b42fcdf0 100644--- a/apps/checker/ping.go+++ b/apps/checker/ping.go@@ -9,16 +9,18 @@ import ("net/url""os""time"++ "github.com/openstatushq/openstatus/apps/checker/request")type PingData struct {- WorkspaceId string `json:"workspaceId"`- MonitorId string `json:"monitorId"`+ WorkspaceID string `json:"workspaceId"`+ MonitorID string `json:"monitorId"`Timestamp int64 `json:"timestamp"`StatusCode int `json:"statusCode,omitempty"`Latency int64 `json:"latency"`CronTimestamp int64 `json:"cronTimestamp"`- Url string `json:"url"`+ URL string `json:"url"`Region string `json:"region"`Message string `json:"message,omitempty"`}@@ -63,14 +65,14 @@ func sendToTinybirdNew(pingData PingData) {}-func ping(client *http.Client, inputData InputData) (PingData, error) {+func ping(client *http.Client, inputData request.CheckerRequest) (PingData, error) {region := os.Getenv("FLY_REGION")- request, err := http.NewRequest(inputData.Method, inputData.Url, bytes.NewReader([]byte(inputData.Body)))-+ request, err := http.NewRequest(inputData.Method, inputData.URL, bytes.NewReader([]byte(inputData.Body)))if err != nil {return PingData{}, fmt.Errorf("Unable to create request: %w", err)}+request.Header.Set("User-Agent", "OpenStatus/1.0")// Setting headers@@ -89,33 +91,33 @@ func ping(client *http.Client, inputData InputData) (PingData, error) {if urlErr.Timeout() {return PingData{Latency: latency,- MonitorId: inputData.MonitorId,+ MonitorID: inputData.MonitorID,Region: region,- WorkspaceId: inputData.WorkspaceId,+ WorkspaceID: inputData.WorkspaceID,Timestamp: time.Now().UTC().UnixMilli(),- Url: inputData.Url,+ URL: inputData.URL,Message: fmt.Sprintf("Timeout after %d ms", latency),}, nil}}- return PingData{}, fmt.Errorf("Error with monitor %s: %w", inputData.Url, err)+ return PingData{}, fmt.Errorf("Error with monitor %s: %w", inputData.URL, err)}defer response.Body.Close()_, err = io.ReadAll(response.Body)if err != nil {- return PingData{}, fmt.Errorf("Error while reading body from %s: %w", inputData.Url, err)+ return PingData{}, fmt.Errorf("Error while reading body from %s: %w", inputData.URL, err)}return PingData{Latency: latency,StatusCode: response.StatusCode,- MonitorId: inputData.MonitorId,+ MonitorID: inputData.MonitorID,Region: region,- WorkspaceId: inputData.WorkspaceId,+ WorkspaceID: inputData.WorkspaceID,Timestamp: time.Now().UTC().UnixMilli(),CronTimestamp: inputData.CronTimestamp,- Url: inputData.Url,+ URL: inputData.URL,}, nil}diff --git a/apps/checker/ping_test.go b/apps/checker/ping_test.goindex df29de1c1..1d89fec9f 100644--- a/apps/checker/ping_test.go+++ b/apps/checker/ping_test.go@@ -3,12 +3,14 @@ package mainimport ("net/http""testing"++ "github.com/openstatushq/openstatus/apps/checker/request")func Test_ping(t *testing.T) {type args struct {client *http.Client- inputData InputData+ inputData request.CheckerRequest}tests := []struct {name string@@ -16,9 +18,9 @@ func Test_ping(t *testing.T) {want PingDatawantErr bool}{- {name: "200", args: args{client: &http.Client{}, inputData: InputData{Url: "https://openstat.us", CronTimestamp: 1}}, want: PingData{Url: "https://openstat.us", StatusCode: 200}, wantErr: false},- {name: "500", args: args{client: &http.Client{}, inputData: InputData{Url: "https://openstat.us/500", CronTimestamp: 1}}, want: PingData{Url: "https://openstat.us/500", StatusCode: 500}, wantErr: false},- {name: "500", args: args{client: &http.Client{}, inputData: InputData{Url: "https://somethingthatwillfail.ed", CronTimestamp: 1}}, want: PingData{Url: "https://openstat.us/500", StatusCode: 0}, wantErr: true},+ {name: "200", args: args{client: &http.Client{}, inputData: request.CheckerRequest{URL: "https://openstat.us", CronTimestamp: 1}}, want: PingData{URL: "https://openstat.us", StatusCode: 200}, wantErr: false},+ {name: "500", args: args{client: &http.Client{}, inputData: request.CheckerRequest{URL: "https://openstat.us/500", CronTimestamp: 1}}, want: PingData{URL: "https://openstat.us/500", StatusCode: 500}, wantErr: false},+ {name: "500", args: args{client: &http.Client{}, inputData: request.CheckerRequest{URL: "https://somethingthatwillfail.ed", CronTimestamp: 1}}, want: PingData{URL: "https://openstat.us/500", StatusCode: 0}, wantErr: true},// TODO: Add test cases.}diff --git a/apps/checker/request/request.go b/apps/checker/request/request.gonew file mode 100644index 000000000..1d2e7582e--- /dev/null+++ b/apps/checker/request/request.go@@ -0,0 +1,16 @@+package request++type CheckerRequest struct {+ WorkspaceID string `json:"workspaceId"`+ URL string `json:"url"`+ MonitorID string `json:"monitorId"`+ Method string `json:"method"`+ CronTimestamp int64 `json:"cronTimestamp"`+ Body string `json:"body"`+ Headers []struct {+ Key string `json:"key"`+ Value string `json:"value"`+ } `json:"headers,omitempty"`+ PagesIDs []string `json:"pagesIds"`+ Status string `json:"status"`+}