disable report on close when reporting telemetry disabled

hugodutka · hugodutka · commit 7adf58281f29 · 2025-01-30T18:31:42.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -822,10 +822,11 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 
 			if !vals.Telemetry.Enable.Value() {
 				reporter, err := telemetry.New(telemetry.Options{
-					DeploymentID: deploymentID,
-					Database:     options.Database,
-					Logger:       logger.Named("telemetry"),
-					URL:          vals.Telemetry.URL.Value(),
+					DeploymentID:         deploymentID,
+					Database:             options.Database,
+					Logger:               logger.Named("telemetry"),
+					URL:                  vals.Telemetry.URL.Value(),
+					DisableReportOnClose: true,
 				})
 				if err != nil {
 					logger.Debug(ctx, "create telemetry reporter (disabled)", slog.Error(err))
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -47,10 +47,11 @@ type Options struct {
 	// URL is an endpoint to direct telemetry towards!
 	URL *url.URL
 
-	DeploymentID     string
-	DeploymentConfig *codersdk.DeploymentValues
-	BuiltinPostgres  bool
-	Tunnel           bool
+	DeploymentID         string
+	DeploymentConfig     *codersdk.DeploymentValues
+	BuiltinPostgres      bool
+	Tunnel               bool
+	DisableReportOnClose bool
 
 	SnapshotFrequency time.Duration
 	ParseLicenseJWT   func(lic *License) error
@@ -175,10 +176,12 @@ func (r *remoteReporter) Close() {
 	close(r.closed)
 	now := dbtime.Now()
 	r.shutdownAt = &now
-	// Report a final collection of telemetry prior to close!
-	// This could indicate final actions a user has taken, and
-	// the time the deployment was shutdown.
-	r.reportWithDeployment()
+	if !r.options.DisableReportOnClose {
+		// Report a final collection of telemetry prior to close!
+		// This could indicate final actions a user has taken, and
+		// the time the deployment was shutdown.
+		r.reportWithDeployment()
+	}
 	r.closeFunc()
 }
 
