refactor filling out telemetry

spikecurtis · spikecurtis · commit 692e517cebe8 · 2025-03-25T11:11:55.000Z
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1653,29 +1653,7 @@ func (api *API) tailnetRPCConn(rw http.ResponseWriter, r *http.Request) {
 		CoderDesktopVersion: nil,
 	}
 
-	// Parse desktop telemetry from header if it exists
-	desktopTelemetryHeader := r.Header.Get(codersdk.CoderDesktopTelemetryHeader)
-	if desktopTelemetryHeader != "" {
-		var telemetryData codersdk.CoderDesktopTelemetry
-		if err := telemetryData.FromHeader(desktopTelemetryHeader); err == nil {
-			// Only set fields if they aren't empty
-			if telemetryData.DeviceID != "" {
-				connectionTelemetryEvent.DeviceID = &telemetryData.DeviceID
-			}
-			if telemetryData.DeviceOS != "" {
-				connectionTelemetryEvent.DeviceOS = &telemetryData.DeviceOS
-			}
-			if telemetryData.CoderDesktopVersion != "" {
-				connectionTelemetryEvent.CoderDesktopVersion = &telemetryData.CoderDesktopVersion
-			}
-			api.Logger.Debug(ctx, "received desktop telemetry",
-				slog.F("device_id", telemetryData.DeviceID),
-				slog.F("device_os", telemetryData.DeviceOS),
-				slog.F("desktop_version", telemetryData.CoderDesktopVersion))
-		} else {
-			api.Logger.Warn(ctx, "failed to parse desktop telemetry header", slog.Error(err))
-		}
-	}
+	fillCoderDesktopTelemetry(r, &connectionTelemetryEvent, api.Logger)
 	api.Telemetry.Report(&telemetry.Snapshot{
 		UserTailnetConnections: []telemetry.UserTailnetConnection{connectionTelemetryEvent},
 	})
@@ -1705,6 +1683,34 @@ func (api *API) tailnetRPCConn(rw http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// fillCoderDesktopTelemetry fills out the provided event based on a Coder Desktop telemetry header on the request, if
+// present.
+func fillCoderDesktopTelemetry(r *http.Request, event *telemetry.UserTailnetConnection, logger slog.Logger) {
+	// Parse desktop telemetry from header if it exists
+	desktopTelemetryHeader := r.Header.Get(codersdk.CoderDesktopTelemetryHeader)
+	if desktopTelemetryHeader != "" {
+		var telemetryData codersdk.CoderDesktopTelemetry
+		if err := telemetryData.FromHeader(desktopTelemetryHeader); err == nil {
+			// Only set fields if they aren't empty
+			if telemetryData.DeviceID != "" {
+				event.DeviceID = &telemetryData.DeviceID
+			}
+			if telemetryData.DeviceOS != "" {
+				event.DeviceOS = &telemetryData.DeviceOS
+			}
+			if telemetryData.CoderDesktopVersion != "" {
+				event.CoderDesktopVersion = &telemetryData.CoderDesktopVersion
+			}
+			logger.Debug(r.Context(), "received desktop telemetry",
+				slog.F("device_id", telemetryData.DeviceID),
+				slog.F("device_os", telemetryData.DeviceOS),
+				slog.F("desktop_version", telemetryData.CoderDesktopVersion))
+		} else {
+			logger.Warn(r.Context(), "failed to parse desktop telemetry header", slog.Error(err))
+		}
+	}
+}
+
 // createExternalAuthResponse creates an ExternalAuthResponse based on the
 // provider type. This is to support legacy `/workspaceagents/me/gitauth`
 // which uses `Username` and `Password`.
