Merge branch '299-telemetry-requests' into 'master'

agneum · agneum · commit 4d6e496a45cb · 2021-11-29T15:47:39.000Z
fix: rename the payload parameter in telemetry requests because the current request body contains other field names (#299)

Closes #299

See merge request postgres-ai/database-lab!379
diff --git a/cmd/database-lab/main.go b/cmd/database-lab/main.go
@@ -192,7 +192,7 @@ func main() {
 
 	shutdownDatabaseLabEngine(shutdownCtx, dockerCLI, engProps, pm.First().Pool())
 	cloningSvc.SaveClonesState()
-	tm.SendEvent(ctx, telemetry.EngineStoppedEvent, telemetry.EngineStopped{Uptime: server.Uptime()})
+	tm.SendEvent(context.Background(), telemetry.EngineStoppedEvent, telemetry.EngineStopped{Uptime: server.Uptime()})
 }
 
 func getEngineProperties(ctx context.Context, dockerCLI *client.Client, cfg *config.Config) (global.EngineProps, error) {
diff --git a/pkg/client/platform/telemetry.go b/pkg/client/platform/telemetry.go
@@ -16,7 +16,7 @@ import (
 type TelemetryEvent struct {
 	InstanceID string      `json:"instance_id"`
 	EventType  string      `json:"event_type"`
-	Payload    interface{} `json:"payload"`
+	Payload    interface{} `json:"event_data"`
 }
 
 // SendTelemetryEvent makes an HTTP request to send a telemetry event to the Platform.

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func main() {`
`192`	`192`
`193`	`193`	`shutdownDatabaseLabEngine(shutdownCtx, dockerCLI, engProps, pm.First().Pool())`
`194`	`194`	`cloningSvc.SaveClonesState()`
`195`		`- tm.SendEvent(ctx, telemetry.EngineStoppedEvent, telemetry.EngineStopped{Uptime: server.Uptime()})`
	`195`	`+ tm.SendEvent(context.Background(), telemetry.EngineStoppedEvent, telemetry.EngineStopped{Uptime: server.Uptime()})`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`func getEngineProperties(ctx context.Context, dockerCLI client.Client, cfg config.Config) (global.EngineProps, error) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`type TelemetryEvent struct {`
`17`	`17`	InstanceID string `json:"instance_id"`
`18`	`18`	EventType string `json:"event_type"`
`19`		- Payload interface{} `json:"payload"`
	`19`	+ Payload interface{} `json:"event_data"`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// SendTelemetryEvent makes an HTTP request to send a telemetry event to the Platform.`