Add migrate logging

pkg/cli/migrate.go

@@ -3,6 +3,9 @@ package cli
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/replicate/cog/pkg/coglog"
+	"github.com/replicate/cog/pkg/docker"
+	"github.com/replicate/cog/pkg/http"
 	"github.com/replicate/cog/pkg/migrate"
 )
 
@@ -28,14 +31,26 @@ This will attempt to migrate your cog project to be compatible with fast boots.`
 
 func cmdMigrate(cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
+
+	command := docker.NewDockerCommand()
+	client, err := http.ProvideHTTPClient(ctx, command)
+	if err != nil {
+		return err
+	}
+	logClient := coglog.NewClient(client)
+	logCtx := logClient.StartMigrate(migrateAccept)
+
 	migrator, err := migrate.NewMigrator(migrate.MigrationV1, migrate.MigrationV1Fast, !migrateAccept)
 	if err != nil {
+		logClient.EndMigrate(ctx, err, logCtx)
 		return err
 	}
 	err = migrator.Migrate(ctx, configFilename)
 	if err != nil {
+		logClient.EndMigrate(ctx, err, logCtx)
 		return err
 	}
+	logClient.EndMigrate(ctx, nil, logCtx)
 
 	return nil
 }

pkg/coglog/client.go

@@ -31,6 +31,11 @@ type PushLogContext struct {
 	localImage bool
 }
 
+type MigrateLogContext struct {
+	started time.Time
+	accept  bool
+}
+
 type buildLog struct {
 	DurationMs float32 `json:"length_ms"`
 	BuildError *string `json:"error"`
@@ -45,6 +50,12 @@ type pushLog struct {
 	LocalImage bool    `json:"local_image"`
 }
 
+type migrateLog struct {
+	DurationMs float32 `json:"length_ms"`
+	BuildError *string `json:"error"`
+	Accept     bool    `json:"accept"`
+}
+
 func NewClient(client *http.Client) *Client {
 	return &Client{
 		client: client,
@@ -79,7 +90,7 @@ func (c *Client) EndBuild(ctx context.Context, err error, logContext BuildLogCon
 		return false
 	}
 
-	err = c.postLog(ctx, jsonData)
+	err = c.postLog(ctx, jsonData, "build")
 	if err != nil {
 		console.Warn(err.Error())
 		return false
@@ -116,7 +127,42 @@ func (c *Client) EndPush(ctx context.Context, err error, logContext PushLogConte
 		return false
 	}
 
-	err = c.postLog(ctx, jsonData)
+	err = c.postLog(ctx, jsonData, "push")
+	if err != nil {
+		console.Warn(err.Error())
+		return false
+	}
+
+	return true
+}
+
+func (c *Client) StartMigrate(accept bool) MigrateLogContext {
+	logContext := MigrateLogContext{
+		started: time.Now(),
+		accept:  accept,
+	}
+	return logContext
+}
+
+func (c *Client) EndMigrate(ctx context.Context, err error, logContext MigrateLogContext) bool {
+	var errorStr *string = nil
+	if err != nil {
+		errStr := err.Error()
+		errorStr = &errStr
+	}
+	migrateLog := migrateLog{
+		DurationMs: float32(time.Now().Sub(logContext.started).Milliseconds()),
+		BuildError: errorStr,
+		Accept:     logContext.accept,
+	}
+
+	jsonData, err := json.Marshal(migrateLog)
+	if err != nil {
+		console.Warn("Failed to marshal JSON for build log: " + err.Error())
+		return false
+	}
+
+	err = c.postLog(ctx, jsonData, "migrate")
 	if err != nil {
 		console.Warn(err.Error())
 		return false
@@ -125,7 +171,7 @@ func (c *Client) EndPush(ctx context.Context, err error, logContext PushLogConte
 	return true
 }
 
-func (c *Client) postLog(ctx context.Context, jsonData []byte) error {
+func (c *Client) postLog(ctx context.Context, jsonData []byte, action string) error {
 	disabled, err := DisableFromEnvironment()
 	if err != nil {
 		return err
@@ -134,7 +180,7 @@ func (c *Client) postLog(ctx context.Context, jsonData []byte) error {
 		return errors.New("Cog logging disabled")
 	}
 
-	url := buildURL()
+	url := actionURL(action)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPut, url.String(), bytes.NewReader(jsonData))
 	if err != nil {
 		return err
@@ -156,8 +202,8 @@ func baseURL() url.URL {
 	}
 }
 
-func buildURL() url.URL {
+func actionURL(action string) url.URL {
 	url := baseURL()
-	url.Path = strings.Join([]string{"", "v1", "build"}, "/")
+	url.Path = strings.Join([]string{"", "v1", action}, "/")
 	return url
 }