🔥 tcp timestamp (#1043)

* 🔥 tcp timestamp * 🔥 tcp timestamp
openstatusHQ · Oct 9, 2024 · 4452dbc · 4452dbc
1 parent 4ca5896
commit 4452dbc
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 35 deletions.
diff --git a/apps/checker/handlers/tcp.go b/apps/checker/handlers/tcp.go
@@ -28,12 +28,14 @@ type TCPData struct {
 	Timing       string `json:"timing"`
 	ErrorMessage string `json:"errorMessage"`
 	Region       string `json:"region"`
+	Trigger      string `json:"trigger"`
 
-	RequestId   int64 `json:"requestId,omitempty"`
-	WorkspaceID int64 `json:"workspaceId"`
-	MonitorID   int64 `json:"monitorId"`
-	Timestamp   int64 `json:"timestamp"`
-	Latency     int64 `json:"latency"`
+	RequestId     int64 `json:"requestId,omitempty"`
+	WorkspaceID   int64 `json:"workspaceId"`
+	MonitorID     int64 `json:"monitorId"`
+	Timestamp     int64 `json:"timestamp"`
+	Latency       int64 `json:"latency"`
+	CronTimestamp int64 `json:"cronTimestamp"`
 
 	Error uint8 `json:"error"`
 }
@@ -101,14 +103,16 @@ func (h Handler) TCPHandler(c *gin.Context) {
 		latency := res.TCPDone - res.TCPStart
 
 		data := TCPData{
-			WorkspaceID:  workspaceId,
-			Timestamp:    req.CronTimestamp,
-			Error:        0,
-			ErrorMessage: "",
-			Region:       h.Region,
-			MonitorID:    monitorId,
-			Timing:       string(timingAsString),
-			Latency:      latency,
+			WorkspaceID:   workspaceId,
+			Timestamp:     res.TCPStart,
+			Error:         0,
+			ErrorMessage:  "",
+			Region:        h.Region,
+			MonitorID:     monitorId,
+			Timing:        string(timingAsString),
+			Latency:       latency,
+			CronTimestamp: req.CronTimestamp,
+			Trigger:       "cron",
 		}
 
 		if req.Status == "active" && req.DegradedAfter > 0 && latency > req.DegradedAfter {
@@ -159,12 +163,13 @@ func (h Handler) TCPHandler(c *gin.Context) {
 
 	if err := backoff.Retry(op, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 3)); err != nil {
 		if err := h.TbClient.SendEvent(ctx, TCPData{
-			WorkspaceID:  workspaceId,
-			Timestamp:    req.CronTimestamp,
-			ErrorMessage: err.Error(),
-			Region:       h.Region,
-			MonitorID:    monitorId,
-			Error:        1,
+			WorkspaceID:   workspaceId,
+			CronTimestamp: req.CronTimestamp,
+			ErrorMessage:  err.Error(),
+			Region:        h.Region,
+			MonitorID:     monitorId,
+			Error:         1,
+			Trigger:       "cron",
 		}, dataSourceName); err != nil {
 			log.Ctx(ctx).Error().Err(err).Msg("failed to send event to tinybird")
 		}
@@ -265,15 +270,17 @@ func (h Handler) TCPHandlerRegion(c *gin.Context) {
 		latency := res.TCPDone - res.TCPStart
 
 		data := TCPData{
-			WorkspaceID:  workspaceId,
-			Timestamp:    req.CronTimestamp,
-			Error:        0,
-			ErrorMessage: "",
-			Region:       h.Region,
-			MonitorID:    monitorId,
-			Timing:       string(timingAsString),
-			Latency:      latency,
-			RequestId:    req.RequestId,
+			WorkspaceID:   workspaceId,
+			CronTimestamp: req.CronTimestamp,
+			Timestamp:     res.TCPStart,
+			Error:         0,
+			ErrorMessage:  "",
+			Region:        h.Region,
+			MonitorID:     monitorId,
+			Timing:        string(timingAsString),
+			Latency:       latency,
+			RequestId:     req.RequestId,
+			Trigger:       "API",
 		}
 
 		if req.RequestId != 0 {
@@ -287,13 +294,14 @@ func (h Handler) TCPHandlerRegion(c *gin.Context) {
 
 	if err := backoff.Retry(op, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 3)); err != nil && req.RequestId != 0 {
 		if err := h.TbClient.SendEvent(ctx, TCPData{
-			WorkspaceID:  workspaceId,
-			Timestamp:    req.CronTimestamp,
-			ErrorMessage: err.Error(),
-			Region:       h.Region,
-			MonitorID:    monitorId,
-			Error:        1,
-			RequestId:    req.RequestId,
+			WorkspaceID:   workspaceId,
+			CronTimestamp: req.CronTimestamp,
+			ErrorMessage:  err.Error(),
+			Region:        h.Region,
+			MonitorID:     monitorId,
+			Error:         1,
+			RequestId:     req.RequestId,
+			Trigger:       "api",
 		}, dataSourceName); err != nil {
 			log.Ctx(ctx).Error().Err(err).Msg("failed to send event to tinybird")
 		}

diff --git a/packages/tinybird/datasources/tcp_response.datasource b/packages/tinybird/datasources/tcp_response.datasource
@@ -4,11 +4,14 @@ SCHEMA >
     `monitorId` Int32 `json:$.monitorId`,
     `region` String `json:$.region`,
     `timestamp` Int64 `json:$.timestamp`,
+    `cronTimestamp` Int64 `json:$.timestamp`,
     `timing` String `json:$.timing`,
     `workspaceId` Int32 `json:$.workspaceId`,
     `latency` Int64 `json:$.latency`,
     `errorMessage` Nullable(String) `json:$.errorMessage`,
     `error` Int16 `json:$.error`
+    `trigger` Nullable(String) `json:$.trigger`,
+
 
 ENGINE "MergeTree"
 ENGINE_PARTITION_KEY "toYYYYMM(fromUnixTimestamp64Milli(timestamp))"