MM-12342: merge the experimental channel store (#9681)

* MM-12342: merge the experimental channel store

* gofmt after upgrading to go 1.11

app/app.go

@@ -219,14 +219,6 @@ func New(options ...Option) (outApp *App, outErr error) {
 
 	app.Srv.Store = app.newStore()
 
-	app.AddConfigListener(func(_, current *model.Config) {
-		if current.SqlSettings.EnablePublicChannelsMaterialization != nil && !*current.SqlSettings.EnablePublicChannelsMaterialization {
-			app.Srv.Store.Channel().DisableExperimentalPublicChannelsMaterialization()
-		} else {
-			app.Srv.Store.Channel().EnableExperimentalPublicChannelsMaterialization()
-		}
-	})
-
 	if err := app.ensureAsymmetricSigningKey(); err != nil {
 		return nil, errors.Wrapf(err, "unable to ensure asymmetric signing key")
 	}

app/diagnostics.go

@@ -306,15 +306,14 @@ func (a *App) trackConfig() {
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_SQL, map[string]interface{}{
-		"driver_name":                            *cfg.SqlSettings.DriverName,
-		"trace":                                  cfg.SqlSettings.Trace,
-		"max_idle_conns":                         *cfg.SqlSettings.MaxIdleConns,
-		"conn_max_lifetime_milliseconds":         *cfg.SqlSettings.ConnMaxLifetimeMilliseconds,
-		"max_open_conns":                         *cfg.SqlSettings.MaxOpenConns,
-		"data_source_replicas":                   len(cfg.SqlSettings.DataSourceReplicas),
-		"data_source_search_replicas":            len(cfg.SqlSettings.DataSourceSearchReplicas),
-		"query_timeout":                          *cfg.SqlSettings.QueryTimeout,
-		"enable_public_channels_materialization": *cfg.SqlSettings.EnablePublicChannelsMaterialization,
+		"driver_name":                    *cfg.SqlSettings.DriverName,
+		"trace":                          cfg.SqlSettings.Trace,
+		"max_idle_conns":                 *cfg.SqlSettings.MaxIdleConns,
+		"conn_max_lifetime_milliseconds": *cfg.SqlSettings.ConnMaxLifetimeMilliseconds,
+		"max_open_conns":                 *cfg.SqlSettings.MaxOpenConns,
+		"data_source_replicas":           len(cfg.SqlSettings.DataSourceReplicas),
+		"data_source_search_replicas":    len(cfg.SqlSettings.DataSourceSearchReplicas),
+		"query_timeout":                  *cfg.SqlSettings.QueryTimeout,
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_LOG, map[string]interface{}{