telemetry: resource control telemetry

ddl/resource_group_test.go

@@ -156,6 +156,7 @@ func TestResourceGroupBasic(t *testing.T) {
 	tk.MustQuery("select * from information_schema.resource_groups where group_name = 'y'").Check(testkit.Rows(strconv.FormatInt(g2.ID, 10) + " y 4000 2000"))
 	tk.MustQuery("show create resource group y").Check(testkit.Rows("y CREATE RESOURCE GROUP `y` RRU_PER_SEC=4000 WRU_PER_SEC=2000"))
 
+	tk.MustQuery("select count(*) from information_schema.resource_groups").Check(testkit.Rows("2"))
 	tk.MustGetErrCode("create user usr_fail resource group nil_group", mysql.ErrResourceGroupNotExists)
 	tk.MustExec("create user user2")
 	tk.MustGetErrCode("alter user user2 resource group nil_group", mysql.ErrResourceGroupNotExists)

infoschema/builder.go

@@ -858,6 +858,7 @@ func (b *Builder) InitWithOldInfoSchema(oldSchema InfoSchema) *Builder {
 	b.copySchemasMap(oldIS)
 	b.copyBundlesMap(oldIS)
 	b.copyPoliciesMap(oldIS)
+	b.copyResourceGroupMap(oldIS)
 	b.copyTemporaryTableIDsMap(oldIS)
 	b.copyReferredForeignKeyMap(oldIS)
 
@@ -885,6 +886,13 @@ func (b *Builder) copyPoliciesMap(oldIS *infoSchema) {
 	}
 }
 
+func (b *Builder) copyResourceGroupMap(oldIS *infoSchema) {
+	is := b.is
+	for _, v := range oldIS.AllResourceGroups() {
+		is.resourceGroupMap[v.Name.L] = v
+	}
+}
+
 func (b *Builder) copyTemporaryTableIDsMap(oldIS *infoSchema) {
 	is := b.is
 	if len(oldIS.temporaryTableIDs) == 0 {

telemetry/data_feature_usage.go

@@ -59,6 +59,7 @@ type featureUsage struct {
 	EnableGlobalMemoryControl bool                             `json:"enableGlobalMemoryControl"`
 	AutoIDNoCache             bool                             `json:"autoIDNoCache"`
 	IndexMergeUsageCounter    *m.IndexMergeUsageCounter        `json:"indexMergeUsageCounter"`
+	ResourceControlUsage      *resourceControlUsage            `json:"resourceControl"`
 }
 
 type placementPolicyUsage struct {
@@ -69,6 +70,11 @@ type placementPolicyUsage struct {
 	NumPartitionWithExplicitPolicies uint64 `json:"numPartitionWithExplicitPolicies"`
 }
 
+type resourceControlUsage struct {
+	Enabled           bool   `json:"resourceControlEnabled"`
+	NumResourceGroups uint64 `json:"numResourceGroups"`
+}
+
 func getFeatureUsage(ctx context.Context, sctx sessionctx.Context) (*featureUsage, error) {
 	var usage featureUsage
 	var err error
@@ -114,11 +120,12 @@ func getFeatureUsage(ctx context.Context, sctx sessionctx.Context) (*featureUsag
 	return &usage, nil
 }
 
-// collectFeatureUsageFromInfoschema updates the usage for temporary table, cached table and placement policies.
+// collectFeatureUsageFromInfoschema updates the usage for temporary table, cached table, placement policies and resource groups.
 func collectFeatureUsageFromInfoschema(ctx sessionctx.Context, usage *featureUsage) {
 	if usage.PlacementPolicyUsage == nil {
 		usage.PlacementPolicyUsage = &placementPolicyUsage{}
 	}
+
 	is := GetDomainInfoSchema(ctx)
 	for _, dbInfo := range is.AllSchemas() {
 		if dbInfo.PlacementPolicyRef != nil {
@@ -149,8 +156,13 @@ func collectFeatureUsageFromInfoschema(ctx sessionctx.Context, usage *featureUsa
 			}
 		}
 	}
-
 	usage.PlacementPolicyUsage.NumPlacementPolicies += uint64(len(is.AllPlacementPolicies()))
+
+	if usage.ResourceControlUsage == nil {
+		usage.ResourceControlUsage = &resourceControlUsage{}
+	}
+	usage.ResourceControlUsage.NumResourceGroups = uint64(len(is.AllResourceGroups()))
+	usage.ResourceControlUsage.Enabled = variable.EnableResourceControl.Load()
 }
 
 // GetDomainInfoSchema is used by the telemetry package to get the latest schema information

telemetry/data_feature_usage_test.go

@@ -337,6 +337,45 @@ func TestPlacementPolicies(t *testing.T) {
 	require.Equal(t, uint64(1), usage.PlacementPolicyUsage.NumPartitionWithExplicitPolicies)
 }
 
+func TestResourceGroups(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+
+	tk := testkit.NewTestKit(t, store)
+
+	usage, err := telemetry.GetFeatureUsage(tk.Session())
+	require.NoError(t, err)
+	require.Equal(t, uint64(0), usage.ResourceControlUsage.NumResourceGroups)
+	require.Equal(t, false, usage.ResourceControlUsage.Enabled)
+
+	tk.MustExec("set global tidb_enable_resource_control = 'ON'")
+	tk.MustExec("create resource group x rru_per_sec=100 wru_per_sec=200")
+	usage, err = telemetry.GetFeatureUsage(tk.Session())
+	require.NoError(t, err)
+	require.Equal(t, true, usage.ResourceControlUsage.Enabled)
+	require.Equal(t, uint64(1), usage.ResourceControlUsage.NumResourceGroups)
+
+	tk.MustExec("create resource group y rru_per_sec=100 wru_per_sec=200")
+	usage, err = telemetry.GetFeatureUsage(tk.Session())
+	require.NoError(t, err)
+	require.Equal(t, uint64(2), usage.ResourceControlUsage.NumResourceGroups)
+
+	tk.MustExec("alter resource group y rru_per_sec=100 wru_per_sec=300")
+	usage, err = telemetry.GetFeatureUsage(tk.Session())
+	require.NoError(t, err)
+	require.Equal(t, uint64(2), usage.ResourceControlUsage.NumResourceGroups)
+
+	tk.MustExec("drop resource group y")
+	usage, err = telemetry.GetFeatureUsage(tk.Session())
+	require.NoError(t, err)
+	require.Equal(t, uint64(1), usage.ResourceControlUsage.NumResourceGroups)
+
+	tk.MustExec("set global tidb_enable_resource_control = 'OFF'")
+	usage, err = telemetry.GetFeatureUsage(tk.Session())
+	require.NoError(t, err)
+	require.Equal(t, uint64(1), usage.ResourceControlUsage.NumResourceGroups)
+	require.Equal(t, false, usage.ResourceControlUsage.Enabled)
+}
+
 func TestAutoCapture(t *testing.T) {
 	store := testkit.CreateMockStore(t)