send settings counts as part of app:counts

Author: sawka

cmd/server/main-server.go

@@ -145,6 +145,18 @@ func updateTelemetryCounts(lastCounts telemetrydata.TEventProps) telemetrydata.T
 	props.CountSSHConn = conncontroller.GetNumSSHHasConnected()
 	props.CountWSLConn = wslconn.GetNumWSLHasConnected()
 	props.CountViews, _ = wstore.DBGetBlockViewCounts(ctx)
+
+	fullConfig := wconfig.GetWatcher().GetFullConfig()
+	customWidgets := fullConfig.CountCustomWidgets()
+	customAIPresets := fullConfig.CountCustomAIPresets()
+	customSettings := wconfig.CountCustomSettings()
+
+	props.UserSet = &telemetrydata.TEventUserProps{
+		SettingsCustomWidgets:   customWidgets,
+		SettingsCustomAIPresets: customAIPresets,
+		SettingsCustomSettings:  customSettings,
+	}
+
 	if utilfn.CompareAsMarshaledJson(props, lastCounts) {
 		return lastCounts
 	}

pkg/telemetry/telemetry.go

@@ -137,11 +137,6 @@ func updateActivityTEvent(ctx context.Context, tevent *telemetrydata.TEvent) err
 	// compute to hour boundary, and round up to next hour
 	eventTs = eventTs.Truncate(time.Hour).Add(time.Hour)
 
-	fullConfig := wconfig.GetWatcher().GetFullConfig()
-	customWidgets := fullConfig.CountCustomWidgets()
-	customAIPresets := fullConfig.CountCustomAIPresets()
-	customSettings := wconfig.CountCustomSettings()
-	
 	return wstore.WithTx(ctx, func(tx *wstore.TxWrap) error {
 		// find event that matches this timestamp with event name "app:activity"
 		var hasRow bool
@@ -158,13 +153,6 @@ func updateActivityTEvent(ctx context.Context, tevent *telemetrydata.TEvent) err
 		}
 		mergeActivity(&curActivity, tevent.Props)
 
-		if curActivity.UserSet == nil {
-			curActivity.UserSet = &telemetrydata.TEventUserProps{}
-		}
-		curActivity.UserSet.SettingsCustomWidgets = customWidgets
-		curActivity.UserSet.SettingsCustomAIPresets = customAIPresets
-		curActivity.UserSet.SettingsCustomSettings = customSettings
-		
 		if hasRow {
 			query := `UPDATE db_tevent SET props = ? WHERE uuid = ?`
 			tx.Exec(query, dbutil.QuickJson(curActivity), uuidStr)