sqlstats: remove sslocal controller

This struct is not very useful as it just provides an interface to reset local
sql stats. This commit removes the sql stats controller defined in sslocal as we
 can access the local sql stats directly.

Epic: none

Release note: None

Author: xinhaoz

pkg/server/application_api/stats_test.go

@@ -64,7 +64,7 @@ CREATE TABLE t.test (x INT PRIMARY KEY);
 
 	// Flush stats at the beginning of the test.
 	require.NoError(t, sqlServer.GetLocalSQLStatsProvider().Reset(ctx))
-	sqlServer.GetReportedSQLStatsController().ResetLocalSQLStats(ctx)
+	require.NoError(t, sqlServer.GetReportedSQLStatsProvider().Reset(ctx))
 
 	// Run some queries mixed with diagnostics, and ensure that the statistics
 	// are unaffected by the calls to report diagnostics.
@@ -178,8 +178,8 @@ func TestSQLStatCollection(t *testing.T) {
 	sqlServer := srv.ApplicationLayer().SQLServer().(*sql.Server)
 
 	// Flush stats at the beginning of the test.
-	sqlServer.GetSQLStatsController().ResetLocalSQLStats(ctx)
-	sqlServer.GetReportedSQLStatsController().ResetLocalSQLStats(ctx)
+	require.NoError(t, sqlServer.GetLocalSQLStatsProvider().Reset(ctx))
+	require.NoError(t, sqlServer.GetReportedSQLStatsProvider().Reset(ctx))
 
 	// Execute some queries against the sqlDB to build up some stats.
 	// As we are scrubbing the stats, we want to make sure the app name
@@ -397,7 +397,7 @@ func TestScrubbedReportingStatsLimit(t *testing.T) {
 	sqlServer := srv.ApplicationLayer().SQLServer().(*sql.Server)
 	// Flush stats at the beginning of the test.
 	require.NoError(t, sqlServer.GetLocalSQLStatsProvider().Reset(ctx))
-	sqlServer.GetReportedSQLStatsController().ResetLocalSQLStats(ctx)
+	require.NoError(t, sqlServer.GetReportedSQLStatsProvider().Reset(ctx))
 
 	hashedAppName := "hashed app name"
 	sqlRunner.Exec(t, `SET application_name = $1;`, hashedAppName)

pkg/server/diagnostics/reporter.go

@@ -281,7 +281,10 @@ func (r *Reporter) ReportDiagnostics(ctx context.Context) {
 		log.Warningf(ctx, "failed to report node usage metrics: status: %s, body: %s", res.Status, b)
 		return
 	}
-	r.SQLServer.GetReportedSQLStatsController().ResetLocalSQLStats(ctx)
+	err = r.SQLServer.GetReportedSQLStatsProvider().Reset(ctx)
+	if err != nil {
+		log.Warningf(ctx, "failed to reset SQL stats: %s", err)
+	}
 }
 
 // GetLastSuccessfulTelemetryPing will return the timestamp of when we last got

pkg/sql/conn_executor.go

@@ -356,10 +356,6 @@ type Server struct {
 	// into reported stats when sqlStats is cleared.
 	reportedStats *sslocal.SQLStats
 
-	// reportedStatsController is the control-plane interface for
-	// reportedStatsController.
-	reportedStatsController *sslocal.Controller
-
 	insights *insights.Provider
 
 	reCache           *tree.RegexpCache
@@ -449,7 +445,6 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
 		nil, /* reportedProvider */
 		cfg.SQLStatsTestingKnobs,
 	)
-	reportedSQLStatsController := reportedSQLStats.GetController(cfg.SQLStatusServer)
 	memSQLStats := sslocal.New(
 		cfg.Settings,
 		sqlstats.MaxMemSQLStatsStmtFingerprints,
@@ -468,18 +463,17 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
 		}
 	})
 	s := &Server{
-		cfg:                     cfg,
-		Metrics:                 metrics,
-		InternalMetrics:         makeMetrics(true /* internal */, &cfg.Settings.SV),
-		ServerMetrics:           serverMetrics,
-		pool:                    pool,
-		localSqlStats:           memSQLStats,
-		reportedStats:           reportedSQLStats,
-		sqlStatsIngester:        sqlStatsIngester,
-		reportedStatsController: reportedSQLStatsController,
-		insights:                insightsProvider,
-		reCache:                 tree.NewRegexpCache(512),
-		toCharFormatCache:       tochar.NewFormatCache(512),
+		cfg:               cfg,
+		Metrics:           metrics,
+		InternalMetrics:   makeMetrics(true /* internal */, &cfg.Settings.SV),
+		ServerMetrics:     serverMetrics,
+		pool:              pool,
+		localSqlStats:     memSQLStats,
+		reportedStats:     reportedSQLStats,
+		sqlStatsIngester:  sqlStatsIngester,
+		insights:          insightsProvider,
+		reCache:           tree.NewRegexpCache(512),
+		toCharFormatCache: tochar.NewFormatCache(512),
 		indexUsageStats: idxusage.NewLocalIndexUsageStats(&idxusage.Config{
 			ChannelSize: idxusage.DefaultChannelSize,
 			Setting:     cfg.Settings,
@@ -725,10 +719,10 @@ func (s *Server) GetLocalSQLStatsProvider() *sslocal.SQLStats {
 	return s.localSqlStats
 }
 
-// GetReportedSQLStatsController returns the sqlstats.Controller for the current
-// sql.Server's reported SQL Stats.
-func (s *Server) GetReportedSQLStatsController() *sslocal.Controller {
-	return s.reportedStatsController
+// GetReportedSQLStatsProvider returns the provider for the in-memory reported
+// sql stats sink.
+func (s *Server) GetReportedSQLStatsProvider() *sslocal.SQLStats {
+	return s.reportedStats
 }
 
 // GetTxnIDCache returns the txnidcache.Cache for the current sql.Server.

pkg/sql/sqlstats/sslocal/BUILD.bazel

@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "cluster_settings.go",
         "sql_stats.go",
-        "sql_stats_controller.go",
         "sql_stats_ingestor.go",
         "sslocal_iterator.go",
         "sslocal_provider.go",

pkg/sql/sqlstats/sslocal/sql_stats_controller.go

@@ -10,7 +10,6 @@ import (
 	"sort"
 	"time"
 
-	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/appstatspb"
@@ -47,12 +46,6 @@ func New(
 	)
 }
 
-// GetController returns a sqlstats.Controller responsible for the current
-// SQLStats.
-func (s *SQLStats) GetController(server serverpb.SQLStatusServer) *Controller {
-	return NewController(s, server)
-}
-
 func (s *SQLStats) Start(ctx context.Context, stopper *stop.Stopper) {
 	// We run a periodic async job to clean up the in-memory stats.
 	_ = stopper.RunAsyncTask(ctx, "sql-stats-clearer", func(ctx context.Context) {