Ensure telemetry is tracked prior to exit

kylecarbs · kylecarbs · commit c3331744a00d · 2022-06-17T04:25:17.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -487,6 +487,8 @@ func server() *cobra.Command {
 				<-devTunnelErrChan
 			}
 
+			// Ensures a last report can be sent before exit!
+			options.Telemetry.Close()
 			cmd.Println("Waiting for WebSocket connections to close...")
 			shutdownConns()
 			coderAPI.Close()
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -493,21 +493,28 @@ func (server *provisionerdServer) FailJob(ctx context.Context, failJob *proto.Fa
 	if job.CompletedAt.Valid {
 		return nil, xerrors.Errorf("job already completed")
 	}
+	job.CompletedAt = sql.NullTime{
+		Time:  database.Now(),
+		Valid: true,
+	}
+	job.Error = sql.NullString{
+		String: failJob.Error,
+		Valid:  failJob.Error != "",
+	}
+
 	err = server.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{
-		ID: jobID,
-		CompletedAt: sql.NullTime{
-			Time:  database.Now(),
-			Valid: true,
-		},
-		UpdatedAt: database.Now(),
-		Error: sql.NullString{
-			String: failJob.Error,
-			Valid:  failJob.Error != "",
-		},
+		ID:          jobID,
+		CompletedAt: job.CompletedAt,
+		UpdatedAt:   database.Now(),
+		Error:       job.Error,
 	})
 	if err != nil {
 		return nil, xerrors.Errorf("update provisioner job: %w", err)
 	}
+	server.Telemetry.Report(&telemetry.Snapshot{
+		ProvisionerJobs: []telemetry.ProvisionerJob{telemetry.ConvertProvisionerJob(job)},
+	})
+
 	switch jobType := failJob.Type.(type) {
 	case *proto.FailedJob_WorkspaceBuild_:
 		if jobType.WorkspaceBuild.State == nil {
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -106,34 +106,34 @@ type remoteReporter struct {
 }
 
 func (r *remoteReporter) Report(snapshot *Snapshot) {
-	snapshot.DeploymentID = r.options.DeploymentID
+	go r.reportSync(snapshot)
+}
 
-	// Runs in a goroutine so it's non-blocking to callers!
-	go func() {
-		data, err := json.Marshal(snapshot)
-		if err != nil {
-			r.options.Logger.Error(r.ctx, "marshal snapshot: %w", slog.Error(err))
-			return
-		}
-		req, err := http.NewRequestWithContext(r.ctx, "POST", r.snapshotURL.String(), bytes.NewReader(data))
-		if err != nil {
-			r.options.Logger.Error(r.ctx, "create request", slog.Error(err))
-			return
-		}
-		req.Header.Set(VersionHeader, buildinfo.Version())
-		resp, err := http.DefaultClient.Do(req)
-		if err != nil {
-			// If the request fails it's not necessarily an error.
-			// In an airgapped environment, it's fine if this fails!
-			r.options.Logger.Debug(r.ctx, "submit", slog.Error(err))
-			return
-		}
-		if resp.StatusCode != http.StatusAccepted {
-			r.options.Logger.Debug(r.ctx, "bad response from telemetry server", slog.F("status", resp.StatusCode))
-			return
-		}
-		r.options.Logger.Debug(r.ctx, "submitted snapshot")
-	}()
+func (r *remoteReporter) reportSync(snapshot *Snapshot) {
+	snapshot.DeploymentID = r.options.DeploymentID
+	data, err := json.Marshal(snapshot)
+	if err != nil {
+		r.options.Logger.Error(r.ctx, "marshal snapshot: %w", slog.Error(err))
+		return
+	}
+	req, err := http.NewRequestWithContext(r.ctx, "POST", r.snapshotURL.String(), bytes.NewReader(data))
+	if err != nil {
+		r.options.Logger.Error(r.ctx, "create request", slog.Error(err))
+		return
+	}
+	req.Header.Set(VersionHeader, buildinfo.Version())
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		// If the request fails it's not necessarily an error.
+		// In an airgapped environment, it's fine if this fails!
+		r.options.Logger.Debug(r.ctx, "submit", slog.Error(err))
+		return
+	}
+	if resp.StatusCode != http.StatusAccepted {
+		r.options.Logger.Debug(r.ctx, "bad response from telemetry server", slog.F("status", resp.StatusCode))
+		return
+	}
+	r.options.Logger.Debug(r.ctx, "submitted snapshot")
 }
 
 func (r *remoteReporter) Close() {
@@ -203,7 +203,7 @@ func (r *remoteReporter) reportWithDeployment() {
 		r.options.Logger.Error(r.ctx, "create snapshot", slog.Error(err))
 		return
 	}
-	r.Report(snapshot)
+	r.reportSync(snapshot)
 }
 
 // deployment collects host information and reports it to the telemetry server.

Original file line number	Diff line number	Diff line change
`@@ -487,6 +487,8 @@ func server() *cobra.Command {`
`487`	`487`	`<-devTunnelErrChan`
`488`	`488`	`}`
`489`	`489`
	`490`	`+ // Ensures a last report can be sent before exit!`
	`491`	`+ options.Telemetry.Close()`
`490`	`492`	`cmd.Println("Waiting for WebSocket connections to close...")`
`491`	`493`	`shutdownConns()`
`492`	`494`	`coderAPI.Close()`