Remove glog logging support

.agents/skills/e2e-tests/SKILL.md

@@ -56,7 +56,6 @@ $VTDATAROOT/
       vtgate-stderr.txt
       vttablet-stderr.txt
       mysqlctl-stderr.txt
-      *.INFO, *.WARNING, *.ERROR   # glog files
     backups/                  # backup data
 ```
 
@@ -68,7 +67,7 @@ When a test fails, read logs from the tmp directory inside the cluster's VTDATAR
 $VTDATAROOT/vtroot_<port>/tmp_<port>/
 ```
 
-Look for `*-stderr.txt` files and glog files (`*.INFO`, `*.WARNING`, `*.ERROR`).
+Look for `*-stderr.txt` files.
 
 ### Clear between runs
 
@@ -91,4 +90,4 @@ Each end-to-end test package starts a `cluster.LocalProcessCluster` (topo, vtctl
 3. Run the failing test with `-v`
 4. On failure, read logs from `$VTDATAROOT/vtroot_*/tmp_*/`
 5. Check `*-stderr.txt` files first for startup errors
-6. Check glog `*.ERROR` and `*.WARNING` files for runtime errors
+6. Check `*-stderr.txt` files for runtime errors. Search for the `ERR` and `WRN` levels.

.github/workflows/vitess_tester_vtgate.yml

@@ -103,7 +103,7 @@ jobs:
         go install github.com/vitessio/go-junit-report@99fa7f0daf16db969f54a49139a14471e633e6e8 # HEAD
 
         # install vitess tester
-        go install github.com/vitessio/vt/go/vt@e43009309f599378504905d4b804460f47822ac5
+        go install github.com/vitessio/vt/go/vt@cee2a0631a4959284967bd5ea1268c1dcf4aa457
 
     - name: Setup launchable dependencies
       if: github.event_name == 'pull_request' && github.event.pull_request.draft == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'

changelog/25.0/25.0.0/summary.md

@@ -10,6 +10,7 @@
     - **[New Support](#new-support)**
         - [VTOrc failover of an unreachable primary `vttablet` via replica quorum](#vtorc-quorum-unreachable-primary)
     - **[Breaking Changes](#breaking-changes)**
+        - [`glog` logging removed](#glog-removed)
         - [`--watch-replication-stream` flag removed](#vttablet-watch-replication-stream-removed)
         - [VRLog feature removed](#vttablet-vrlog-removed)
         - [Snapshot Topology feature removed](#vtorc-snapshot-topology-removed)
@@ -114,6 +115,41 @@ See [#19918](https://github.com/vitessio/vitess/issues/19918).
 
 ### <a id="breaking-changes"/>Breaking Changes</a>
 
+#### <a id="glog-removed"/>`glog` logging removed</a>
+
+The `glog` backend and its command-line flags have been removed after their deprecation in
+[v24](../../24.0/24.0.0/summary.md#structured-logging). Vitess uses structured logging only.
+
+This release removes the following flags from each binary that registered them.
+
+- `--log-structured`
+- `--log-rotate-max-size`
+- `--logtostderr`, `--alsologtostderr`, `--stderrthreshold`
+- `--log_dir`, `--log_link`, `--log_backtrace_at`
+- `--v`, `--vmodule`, `--logbuflevel`
+- `--keep-logs`, `--keep-logs-by-mtime`, `--purge-logs-interval`
+
+Some of these flags did not show a deprecation warning in v24.
+
+- `--log-structured`, `--log-rotate-max-size`, `--keep-logs`, `--keep-logs-by-mtime`, and `--purge-logs-interval` on
+  all binaries
+- All `glog` flags on `vtctldclient` and `vtctlclient`
+
+`vtctldclient` uses `-v` as the shorthand for `--version`, the same as the other binaries. `-v` does not set a log level.
+
+This release also removes the `/debug/flushlogs` HTTP endpoint.
+
+**Migration**: remove the flags above from startup arguments.
+
+**Impact**: a binary fails to start when it receives a removed flag. Go code that imports Vitess must make these changes.
+
+- Replace `log.V(n).Info` with `log.Debug`.
+- Replace `log.Init(fs)` with `log.Init()`.
+- Remove calls to `log.Flush`, `logutil.Flush`, `logutil.OnFlush`, `logutil.RegisterFlags`, and `logutil.PurgeLogs`.
+- Remove uses of `log.Level`, `log.Verbose`, `PrefixedLogger.V`, and `PrefixedLogger.Flush`.
+
+See [#21310](https://github.com/vitessio/vitess/issues/21310).
+
 #### <a id="vttablet-watch-replication-stream-removed"/>`--watch-replication-stream` flag removed</a>
 
 The deprecated `--watch-replication-stream` VTTablet flag has been removed.

docker/mini/vtctld-mini-up.sh

@@ -30,7 +30,6 @@ vtctld \
  -service-map 'grpc-vtctl' \
  -backup-storage-implementation file \
  -file-backup-storage-root $VTDATAROOT/backups \
- -log_dir $VTDATAROOT/tmp \
  -port $vtctld_web_port \
  -grpc-port $grpc_port \
  -pid-file $VTDATAROOT/tmp/vtctld.pid \

docker/mini/vttablet-mini-up.sh

@@ -41,7 +41,6 @@ echo "  - Tablet listens on http://$hostname:$port"
 # shellcheck disable=SC2086
 vttablet \
  $TOPOLOGY_FLAGS \
- -log_dir $VTDATAROOT/tmp \
  -log-queries-to-file $VTDATAROOT/tmp/$tablet_logfile \
  -tablet-path $alias \
  -tablet-hostname "$hostname" \

examples/common/backup-scripts/mysqlctl-up.sh

@@ -36,7 +36,6 @@ if [ -d $VTDATAROOT/$tablet_dir ]; then
 fi
 
 mysqlctl \
- --log_dir $VTDATAROOT/tmp \
  --tablet-uid $uid \
  --mysql-port $mysql_port \
  $action

examples/common/backup-scripts/vtadmin-up.sh

@@ -39,8 +39,6 @@ vtadmin \
   --tracer "opentelemetry" \
   --grpc-tracing \
   --http-tracing \
-  --logtostderr \
-  --alsologtostderr \
   --rbac \
   --rbac-config="${script_dir}/../vtadmin/rbac.yaml" \
   --cluster "id=${cluster_name},name=${cluster_name},discovery=staticfile,discovery-staticfile-path=${script_dir}/../vtadmin/discovery.json,tablet-fqdn-tmpl=http://{{ .Tablet.Hostname }}:15{{ .Tablet.Alias.Uid }},schema-cache-default-expiration=1m" \

examples/common/backup-scripts/vtctld-up.sh

@@ -27,7 +27,6 @@ vtctld \
  --service-map 'grpc-vtctl,grpc-vtctld' \
  --backup-storage-implementation file \
  --file-backup-storage-root $VTDATAROOT/backups \
- --log_dir $VTDATAROOT/tmp \
  --port $vtctld_web_port \
  --grpc-port $grpc_port \
  --pid-file $VTDATAROOT/tmp/vtctld.pid \

examples/common/backup-scripts/vtgate-up.sh

@@ -28,7 +28,6 @@ echo "Starting vtgate..."
 # shellcheck disable=SC2086
 vtgate \
   $TOPOLOGY_FLAGS \
-  --log_dir $VTDATAROOT/tmp \
   --log-queries-to-file $VTDATAROOT/tmp/vtgate_querylog.txt \
   --port $web_port \
   --grpc-port $grpc_port \

examples/common/backup-scripts/vtorc-up.sh

@@ -10,8 +10,6 @@ port=16000
 echo "Starting vtorc..."
 vtorc \
   $TOPOLOGY_FLAGS \
-  --logtostderr \
-  --alsologtostderr \
   --config-path="${script_dir}/../vtorc/" \
   --config-name="config.yaml" \
   --config-type="yml" \

examples/common/backup-scripts/vttablet-up.sh

@@ -43,7 +43,6 @@ echo "Topology flags at start of backup vttablet, after explicitly setting: $TOP
 # shellcheck disable=SC2086
 vttablet \
  $TOPOLOGY_FLAGS \
- --log_dir $VTDATAROOT/tmp \
  --log-queries-to-file $VTDATAROOT/tmp/$tablet_logfile \
  --tablet-path $alias \
  --tablet-hostname "$tablet_hostname" \

examples/common/backup-scripts/zk-down.sh

@@ -21,6 +21,5 @@ source "$(dirname "${BASH_SOURCE[0]:-$0}")/../env.sh"
 # Stop ZooKeeper servers.
 echo "Stopping zk servers..."
 for zkid in $zkids; do
-  zkctl --zk.myid $zkid --zk.cfg $zkcfg --log_dir $VTDATAROOT/tmp shutdown
+  zkctl --zk.myid $zkid --zk.cfg $zkcfg shutdown
 done
-

examples/common/backup-scripts/zk-up.sh

@@ -31,7 +31,7 @@ for zkid in $zkids; do
     echo "    $VTDATAROOT/$zkdir"
     action='start'
   fi
-  zkctl --zk.myid $zkid --zk.cfg $zkcfg --log_dir $VTDATAROOT/tmp $action \
+  zkctl --zk.myid $zkid --zk.cfg $zkcfg $action \
     > $VTDATAROOT/tmp/zkctl_$zkid.out 2>&1 &
   pids[$zkid]=$!
 done

examples/common/scripts/vtadmin-up.sh

@@ -39,8 +39,6 @@ vtadmin \
   --tracer "opentelemetry" \
   --grpc-tracing \
   --http-tracing \
-  --logtostderr \
-  --alsologtostderr \
   --rbac \
   --rbac-config="${script_dir}/../vtadmin/rbac.yaml" \
   --cluster "id=${cluster_name},name=${cluster_name},discovery=staticfile,discovery-staticfile-path=${script_dir}/../vtadmin/discovery.json,tablet-fqdn-tmpl=http://{{ .Tablet.Hostname }}:15{{ .Tablet.Alias.Uid }},schema-cache-default-expiration=1m" \

examples/common/scripts/vtorc-up.sh

@@ -10,8 +10,6 @@ port=16000
 echo "Starting vtorc..."
 vtorc \
   $TOPOLOGY_FLAGS \
-  --logtostderr \
-  --alsologtostderr \
   --config-path="${script_dir}/../vtorc/" \
   --config-name="config.yaml" \
   --config-type="yml" \

examples/operator/README.md

@@ -31,7 +31,7 @@ kubectl apply -f 101_initial_cluster.yaml
 # VTAdmin's UI will be available at http://localhost:14000/
 ./pf.sh &
 alias mysql="mysql -h 127.0.0.1 -P 15306 -u user"
-alias vtctldclient="vtctldclient --server localhost:15999 --alsologtostderr"
+alias vtctldclient="vtctldclient --server localhost:15999"
 vtctldclient ApplySchema --sql="$(cat ../common/create_commerce_schema.sql)" commerce
 vtctldclient ApplyVSchema --vschema="$(cat ../common/vschema_commerce_initial.json)" commerce
 

examples/operator/pf.sh

@@ -8,7 +8,7 @@ kubectl port-forward -n example --address localhost "$(kubectl get service -n ex
 process_id3=$!
 sleep 2
 echo "You may point your browser to http://localhost:15000, use the following aliases as shortcuts:"
-echo 'alias vtctldclient="vtctldclient --server=localhost:15999 --logtostderr"'
+echo 'alias vtctldclient="vtctldclient --server=localhost:15999"'
 echo 'alias mysql="mysql -h 127.0.0.1 -P 15306 -u user"'
 echo "Hit Ctrl-C to stop the port forwards"
 wait $process_id1

go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/gammazero/deque v1.2.1
 	github.com/go-sql-driver/mysql v1.10.1
 	github.com/go-viper/mapstructure/v2 v2.5.0
-	github.com/golang/glog v1.2.5
 	github.com/golang/snappy v1.0.0
 	github.com/google/go-cmp v0.7.0
 	github.com/google/go-containerregistry v0.22.1

go.sum

@@ -197,8 +197,6 @@ github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PU
 github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
 github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=
-github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

go/cmd/mysqlctl/command/init.go

@@ -33,7 +33,6 @@ var Init = &cobra.Command{
 	Long: "Bootstraps a new `mysqld` instance, initializes its data directory, and starts the instance.\n" +
 		"The MySQL version and flavor will be auto-detected, with a minimal configuration file applied.",
 	Example: `mysqlctl \
-	--alsologtostderr \
 	--tablet-uid 101 \
 	--mysql-port 12345 \
 	init`,

go/cmd/mysqlctl/command/init_config.go

@@ -30,7 +30,6 @@ var InitConfig = &cobra.Command{
 	Long: "Bootstraps the configuration for a new `mysqld` instance and initializes its data directory.\n" +
 		"This command is the same as `init` except the `mysqld` server will not be started.",
 	Example: `mysqlctl \
-	--alsologtostderr \
 	--tablet-uid 101 \
 	--mysql-port 12345 \
 	init_config`,

go/cmd/mysqlctl/command/reinit_config.go

@@ -31,7 +31,6 @@ var ReinitConfig = &cobra.Command{
 	Long: "Regenerate new configuration files for an existing `mysqld` instance (generating new server_id and server_uuid values).\n" +
 		"This could be helpful to revert configuration changes, or to pick up changes made to the bundled config in newer Vitess versions.",
 	Example: `mysqlctl \
-	--alsologtostderr \
 	--tablet-uid 101 \
 	--mysql-port 12345 \
 	reinit_config`,

go/cmd/mysqlctl/command/root.go

@@ -25,7 +25,6 @@ import (
 	vtcmd "vitess.io/vitess/go/cmd"
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/vt/dbconfigs"
-	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/utils"
 )
@@ -54,9 +53,6 @@ var (
 
 			return nil
 		},
-		PersistentPostRun: func(cmd *cobra.Command, args []string) {
-			logutil.Flush()
-		},
 		Version: servenv.AppVersion.String(),
 	}
 )

go/cmd/mysqlctl/command/shutdown.go

@@ -32,7 +32,7 @@ var Shutdown = &cobra.Command{
 	Short: "Shuts down mysqld, without removing any files.",
 	Long: "Stop a `mysqld` instance that was previously started with `init` or `start`.\n\n" +
 		"For large `mysqld` instances, you may need to extend the `wait-time` to shutdown cleanly.",
-	Example: `mysqlctl --tablet-uid 101 --alsologtostderr shutdown`,
+	Example: `mysqlctl --tablet-uid 101 shutdown`,
 	Args:    cobra.NoArgs,
 	RunE:    commandShutdown,
 }

go/cmd/mysqlctl/command/start.go

@@ -32,7 +32,7 @@ var Start = &cobra.Command{
 	Use:     "start",
 	Short:   "Starts mysqld on an already 'init'-ed directory.",
 	Long:    "Resume an existing `mysqld` instance that was previously bootstrapped with `init` or `init_config`",
-	Example: `mysqlctl --tablet-uid 101 --alsologtostderr start`,
+	Example: `mysqlctl --tablet-uid 101 start`,
 	Args:    cobra.NoArgs,
 	RunE:    commandStart,
 }

go/cmd/mysqlctl/command/teardown.go

@@ -34,7 +34,7 @@ var Teardown = &cobra.Command{
 		"This is a destructive operation.\n" +
 		"{{</ warning >}}\n\n" +
 		"Shuts down a `mysqld` instance and removes its data directory.",
-	Example: `mysqlctl --tablet-uid 101 --alsologtostderr teardown`,
+	Example: `mysqlctl --tablet-uid 101 teardown`,
 	Args:    cobra.NoArgs,
 	RunE:    commandTeardown,
 }

go/cmd/mysqlctld/cli/mysqlctld.go

@@ -31,7 +31,6 @@ import (
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"vitess.io/vitess/go/vt/log"
-	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/utils"
@@ -63,7 +62,6 @@ var (
 			"{{</ warning>}}\n\n" +
 			"To enable communication with a `vttablet`, the server must be configured to receive gRPC messages on a unix domain socket.",
 		Example: `mysqlctld \
-	--log_dir=${VTDATAROOT}/logs \
 	--tablet-uid=100 \
 	--mysql-port=17100 \
 	--socket-file=/path/to/socket-file`,
@@ -105,8 +103,6 @@ func init() {
 }
 
 func run(cmd *cobra.Command, args []string) error {
-	defer logutil.Flush()
-
 	// We'll register this OnTerm handler before mysqld starts, so we get notified
 	// if mysqld dies on its own without us (or our RPC client) telling it to.
 	mysqldTerminated := make(chan struct{})

go/cmd/rulesctl/cmd/main.go

@@ -19,9 +19,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	_flag "vitess.io/vitess/go/internal/flag"
 	"vitess.io/vitess/go/vt/log"
-	"vitess.io/vitess/go/vt/logutil"
 )
 
 var configFile string
@@ -31,14 +29,10 @@ func Main() *cobra.Command {
 		Use:  "rulesctl",
 		Args: cobra.NoArgs,
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			_flag.TrickGlog()
-
-			if err := log.Init(cmd.Flags()); err != nil {
+			if err := log.Init(); err != nil {
 				return err
 			}
 
-			logutil.PurgeLogs()
-
 			return nil
 		},
 		Run: func(cmd *cobra.Command, _ []string) { cmd.Help() },

go/cmd/rulesctl/main.go

@@ -22,7 +22,6 @@ import (
 	"vitess.io/vitess/go/acl"
 	"vitess.io/vitess/go/cmd/rulesctl/cmd"
 	vtlog "vitess.io/vitess/go/vt/log"
-	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/utils"
 )
@@ -31,7 +30,6 @@ func main() {
 	rootCmd := cmd.Main()
 	rootCmd.SetGlobalNormalizationFunc(utils.NormalizeUnderscoresToDashes)
 	vtlog.RegisterFlags(rootCmd.PersistentFlags())
-	logutil.RegisterFlags(rootCmd.PersistentFlags())
 	acl.RegisterFlags(rootCmd.PersistentFlags())
 	servenv.RegisterMySQLServerFlags(rootCmd.PersistentFlags())
 	if err := rootCmd.Execute(); err != nil {

go/cmd/topo2topo/cli/topo2topo.go

@@ -24,7 +24,6 @@ import (
 
 	"vitess.io/vitess/go/acl"
 	"vitess.io/vitess/go/vt/grpccommon"
-	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/topo"
@@ -79,7 +78,6 @@ func init() {
 }
 
 func run(cmd *cobra.Command, args []string) error {
-	defer logutil.Flush()
 	servenv.Init()
 
 	fromTS, err := topo.OpenServer(fromImplementation, fromServerAddress, fromRoot)

go/cmd/vtaclcheck/cli/vtactlcheck.go

@@ -20,7 +20,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"vitess.io/vitess/go/acl"
-	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/utils"
 	"vitess.io/vitess/go/vt/vtaclcheck"
@@ -36,10 +35,7 @@ var (
 		Args:    cobra.NoArgs,
 		Version: servenv.AppVersion.String(),
 		PreRunE: servenv.CobraPreRunE,
-		PostRun: func(cmd *cobra.Command, args []string) {
-			logutil.Flush()
-		},
-		RunE: run,
+		RunE:    run,
 	}
 )