Factor out glog references for ease of dropping in an adapter to a different logging library.

Note: This is the revert of a temporary revert and has the same effect
as the original PR: https://github.com/vitessio/vitess/pull/3830

Revert "Revert "Factor out glog references""

This reverts commit 246e2898d2.

Signed-off-by: David Weitzman <dweitzman@pinterest.com>

go/acl/acl.go

@@ -26,7 +26,7 @@ import (
 	"net/http"
 	"sync"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // This is a list of predefined roles. Applications are free

go/cmd/mysqlctl/mysqlctl.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/exit"
@@ -31,6 +30,7 @@ import (
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/netutil"
 	"vitess.io/vitess/go/vt/dbconfigs"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 )

go/cmd/mysqlctld/mysqlctld.go

@@ -24,10 +24,10 @@ import (
 	"os"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/exit"
 	"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"

go/cmd/query_analyzer/query_analyzer.go

@@ -25,8 +25,8 @@ import (
 	"os"
 	"sort"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
 )
 

go/cmd/topo2topo/topo2topo.go

@@ -19,9 +19,9 @@ package main
 import (
 	"flag"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/helpers"

go/cmd/vtclient/vtclient.go

@@ -29,9 +29,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"github.com/olekukonko/tablewriter"
 	"vitess.io/vitess/go/vt/concurrency"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vitessdriver"

go/cmd/vtcombo/main.go

@@ -26,13 +26,13 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"vitess.io/vitess/go/vt/discovery"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/srvtopo"

go/cmd/vtcombo/tablet_map.go

@@ -24,7 +24,6 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/sqltypes"
@@ -32,6 +31,7 @@ import (
 	"vitess.io/vitess/go/vt/grpcclient"
 	"vitess.io/vitess/go/vt/hook"
 	"vitess.io/vitess/go/vt/key"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/mysqlctl/tmutils"

go/cmd/vtctl/vtctl.go

@@ -26,9 +26,9 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/topo"

go/cmd/vtctlclient/main.go

@@ -22,9 +22,9 @@ import (
 	"os"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/vtctl/vtctlclient"
 

go/cmd/vtctld/schema.go

@@ -22,8 +22,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/timer"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/schemamanager"
 	"vitess.io/vitess/go/vt/servenv"

go/cmd/vtexplain/vtexplain.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/vtexplain"

go/cmd/vtgate/vtgate.go

@@ -24,10 +24,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/exit"
 	"vitess.io/vitess/go/vt/discovery"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/srvtopo"
 	"vitess.io/vitess/go/vt/topo"

go/cmd/vtgateclienttest/services/terminal.go

@@ -20,11 +20,10 @@ import (
 	"errors"
 	"fmt"
 
-	log "github.com/golang/glog"
-
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/tb"
+	"vitess.io/vitess/go/vt/log"
 
 	querypb "vitess.io/vitess/go/vt/proto/query"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"

go/cmd/vtqueryserver/vtqueryserver.go

@@ -20,8 +20,8 @@ import (
 	"flag"
 	"os"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/vt/dbconfigs"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/vtqueryserver"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv"

go/cmd/vttablet/vttablet.go

@@ -20,9 +20,9 @@ package main
 import (
 	"flag"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/vt/dbconfigs"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/tableacl"

go/cmd/vttestserver/main.go

@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
+	"vitess.io/vitess/go/vt/log"
 	vttestpb "vitess.io/vitess/go/vt/proto/vttest"
 	"vitess.io/vitess/go/vt/vttest"
 )

go/cmd/vttlstest/vttlstest.go

@@ -21,9 +21,8 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/tlstest"
 )

go/cmd/vtworker/vtworker.go

@@ -29,9 +29,9 @@ import (
 	"os"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/topo"

go/cmd/vtworkerclient/vtworkerclient.go

@@ -22,8 +22,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/worker/vtworkerclient"
 

go/cmd/zk/zkcmd.go

@@ -32,12 +32,12 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/golang/glog"
 	"github.com/samuel/go-zookeeper/zk"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/topo/zk2topo"
 	"vitess.io/vitess/go/vt/vtctl"

go/cmd/zkctl/zkctl.go

@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/zkctl"
 )

go/cmd/zkctld/zkctld.go

@@ -25,8 +25,8 @@ import (
 	"os/signal"
 	"syscall"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/exit"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/zkctl"
 )

go/event/syslogger/syslogger.go

@@ -53,8 +53,8 @@ import (
 	"log/syslog"
 	"os"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/event"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // Syslogger is the interface that events should implement if they want to be

go/exit/exit.go

@@ -50,8 +50,8 @@ package exit
 import (
 	"os"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/tb"
+	"vitess.io/vitess/go/vt/log"
 )
 
 type exitCode int

go/mysql/auth_server.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // AuthServer is the interface that servers must implement to validate

go/mysql/auth_server_static.go

@@ -27,8 +27,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	log "github.com/golang/glog"
-
+	"vitess.io/vitess/go/vt/log"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 )
 

go/mysql/ldapauthserver/auth_server_ldap.go

@@ -25,10 +25,10 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"gopkg.in/ldap.v2"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/netutil"
+	"vitess.io/vitess/go/vt/log"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 	"vitess.io/vitess/go/vt/vttls"
 )

go/mysql/server.go

@@ -24,10 +24,10 @@ import (
 	"net"
 	"time"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/stats"
 	"vitess.io/vitess/go/tb"
+	"vitess.io/vitess/go/vt/log"
 )
 
 const (

go/proc/proc.go

@@ -30,7 +30,7 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 const pidURL = "/debug/pid"

go/stats/export.go

@@ -36,8 +36,8 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/sync2"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var emitStats = flag.Bool("emit_stats", false, "true iff we should emit stats to push-based monitoring/stats backends")

go/stats/influxdbbackend/influxdb_backend.go

@@ -28,9 +28,9 @@ import (
 	"expvar"
 	"flag"
 
-	log "github.com/golang/glog"
 	influxClient "github.com/influxdb/influxdb/client"
 	"vitess.io/vitess/go/stats"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/servenv"
 )
 

go/streamlog/streamlog.go

@@ -28,9 +28,9 @@ import (
 	"sync"
 	"syscall"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/acl"
 	"vitess.io/vitess/go/stats"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/automation/scheduler.go

@@ -26,8 +26,8 @@ import (
 	"fmt"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 	automationpb "vitess.io/vitess/go/vt/proto/automation"
 )
 

go/vt/automation/vtctlclient_wrapper.go

@@ -21,9 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/golang/glog"
-
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/vtctl/vtctlclient"
 

go/vt/automation/vtworkerclient_wrapper.go

@@ -22,8 +22,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/golang/glog"
-
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/worker/vtworkerclient"
 )
 

go/vt/binlog/binlog_streamer.go

@@ -22,13 +22,13 @@ import (
 	"io"
 	"strings"
 
-	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/stats"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/schema"
 

go/vt/binlog/binlogplayer/binlog_player.go

@@ -25,7 +25,6 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 
@@ -33,6 +32,7 @@ import (
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/stats"
 	"vitess.io/vitess/go/sync2"
+	"vitess.io/vitess/go/vt/log"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"

go/vt/binlog/binlogplayer/client.go

@@ -19,9 +19,9 @@ package binlogplayer
 import (
 	"flag"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
+	"vitess.io/vitess/go/vt/log"
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 )

go/vt/binlog/binlogplayer/dbclient.go

@@ -19,12 +19,12 @@ package binlogplayer
 import (
 	"fmt"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // DBClient is a real VtClient backed by a mysql connection.

go/vt/binlog/event_streamer.go

@@ -22,11 +22,11 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/sqltypes"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/schema"
 

go/vt/binlog/keyrange_filter.go

@@ -17,8 +17,8 @@ limitations under the License.
 package binlog
 
 import (
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/vt/key"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlannotation"
 
 	"errors"

go/vt/binlog/slave_connection.go

@@ -20,12 +20,12 @@ import (
 	"fmt"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/pools"
 	"vitess.io/vitess/go/vt/dbconfigs"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/binlog/tables_filter.go

@@ -19,7 +19,7 @@ package binlog
 import (
 	"strings"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	querypb "vitess.io/vitess/go/vt/proto/query"

go/vt/binlog/updatestreamctl.go

@@ -20,13 +20,13 @@ import (
 	"fmt"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/stats"
 	"vitess.io/vitess/go/sync2"
 	"vitess.io/vitess/go/tb"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/schema"
 

go/vt/concurrency/error_recorder.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"sync"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // ErrorRecorder offers a way to record errors during complex

go/vt/dbconfigs/credentials.go

@@ -28,8 +28,8 @@ import (
 	"io/ioutil"
 	"sync"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/mysql"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/dbconfigs/dbconfigs.go

@@ -23,9 +23,8 @@ import (
 	"flag"
 	"fmt"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/mysql"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // We keep a global singleton for the db configs, and that's the one

go/vt/discovery/healthcheck.go

@@ -47,13 +47,13 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/golang/protobuf/proto"
 	"vitess.io/vitess/go/netutil"
 	"vitess.io/vitess/go/stats"
 	"vitess.io/vitess/go/vt/grpcclient"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 	"vitess.io/vitess/go/vt/topotools"
 	"vitess.io/vitess/go/vt/vttablet/queryservice"

go/vt/discovery/tablet_stats_cache.go

@@ -20,8 +20,8 @@ import (
 	"math"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/srvtopo"

go/vt/discovery/topology_watcher.go

@@ -22,10 +22,10 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/vt/key"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 

go/vt/grpcclient/client.go

@@ -25,7 +25,7 @@ import (
 	"vitess.io/vitess/go/vt/grpccommon"
 	"vitess.io/vitess/go/vt/vttls"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // FailFast is a self-documenting type for the grpc.FailFast.

go/vt/grpcclient/glogger.go

@@ -19,8 +19,8 @@ package grpcclient
 import (
 	"fmt"
 
-	log "github.com/golang/glog"
 	"google.golang.org/grpc/grpclog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // grpc doesn't return underlying errors. So, we have

go/vt/hook/hook.go

@@ -26,8 +26,8 @@ import (
 	"strings"
 	"syscall"
 
-	log "github.com/golang/glog"
 	vtenv "vitess.io/vitess/go/vt/env"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // Hook is the input structure for this library.

go/vt/log/log.go

@@ -0,0 +1,56 @@
+// You can modify this file to hook up a different logging library instead of glog.
+// If you adapt to a different logging framework, you may need to use that
+// framework's equivalent of *Depth() functions so the file and line number printed
+// point to the real caller instead of your adapter function.
+
+package log
+
+import (
+	glog "github.com/golang/glog"
+)
+
+// Level is used with V() to test log verbosity.
+type Level = glog.Level
+
+var (
+	// V quickly checks if the logging verbosity meets a threshold.
+	V = glog.V
+
+	// Flush ensures any pending I/O is written.
+	Flush = glog.Flush
+
+	// Info formats arguments like fmt.Print.
+	Info = glog.Info
+	// Infof formats arguments like fmt.Printf.
+	Infof = glog.Infof
+	// InfoDepth formats arguments like fmt.Print and uses depth to choose which call frame to log.
+	InfoDepth = glog.InfoDepth
+
+	// Warning formats arguments like fmt.Print.
+	Warning = glog.Warning
+	// Warningf formats arguments like fmt.Printf.
+	Warningf = glog.Warningf
+	// WarningDepth formats arguments like fmt.Print and uses depth to choose which call frame to log.
+	WarningDepth = glog.WarningDepth
+
+	// Error formats arguments like fmt.Print.
+	Error = glog.Error
+	// Errorf formats arguments like fmt.Printf.
+	Errorf = glog.Errorf
+	// ErrorDepth formats arguments like fmt.Print and uses depth to choose which call frame to log.
+	ErrorDepth = glog.ErrorDepth
+
+	// Exit formats arguments like fmt.Print.
+	Exit = glog.Exit
+	// Exitf formats arguments like fmt.Printf.
+	Exitf = glog.Exitf
+	// ExitDepth formats arguments like fmt.Print and uses depth to choose which call frame to log.
+	ExitDepth = glog.ExitDepth
+
+	// Fatal formats arguments like fmt.Print.
+	Fatal = glog.Fatal
+	// Fatalf formats arguments like fmt.Printf
+	Fatalf = glog.Fatalf
+	// FatalDepth formats arguments like fmt.Print and uses depth to choose which call frame to log.
+	FatalDepth = glog.FatalDepth
+)

go/vt/logutil/console_logger.go

@@ -19,7 +19,7 @@ package logutil
 import (
 	"fmt"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // ConsoleLogger is a Logger that uses glog directly to log, at the right level.

go/vt/logutil/flush_glog.go

@@ -17,7 +17,7 @@ limitations under the License.
 package logutil
 
 import (
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 func init() {

go/vt/logutil/logutil.go

@@ -22,7 +22,7 @@ package logutil
 import (
 	stdlog "log"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 type logShim struct{}

go/vt/logutil/throttled.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // ThrottledLogger will allow logging of messages but won't spam the

go/vt/mysqlctl/backup.go

@@ -30,7 +30,6 @@ import (
 	"strings"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/cgzip"
@@ -39,6 +38,7 @@ import (
 	"vitess.io/vitess/go/sync2"
 	"vitess.io/vitess/go/vt/concurrency"
 	"vitess.io/vitess/go/vt/hook"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl/backupstorage"
 )

go/vt/mysqlctl/cephbackupstorage/ceph.go

@@ -30,11 +30,11 @@ import (
 
 	"errors"
 
-	log "github.com/golang/glog"
 	minio "github.com/minio/minio-go"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/vt/concurrency"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/mysqlctl/backupstorage"
 )
 

go/vt/mysqlctl/metadata_tables.go

@@ -19,9 +19,8 @@ package mysqlctl
 import (
 	"bytes"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/sqltypes"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // Note that definitions of local_metadata and shard_metadata should be the same

go/vt/mysqlctl/mycnf_flag.go

@@ -19,7 +19,7 @@ package mysqlctl
 import (
 	"flag"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // This file handles using command line flags to create a Mycnf object.

go/vt/mysqlctl/mysqlctlclient/interface.go

@@ -22,8 +22,8 @@ import (
 	"flag"
 	"fmt"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var protocol = flag.String("mysqlctl_client_protocol", "grpc", "the protocol to use to talk to the mysqlctl server")

go/vt/mysqlctl/mysqld.go

@@ -40,7 +40,6 @@ import (
 
 	"bytes"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/stats"
@@ -48,6 +47,7 @@ import (
 	"vitess.io/vitess/go/vt/dbconnpool"
 	vtenv "vitess.io/vitess/go/vt/env"
 	"vitess.io/vitess/go/vt/hook"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/mysqlctl/mysqlctlclient"
 )
 

go/vt/mysqlctl/query.go

@@ -23,10 +23,10 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconnpool"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // getPoolReconnect gets a connection from a pool, tests it, and reconnects if

go/vt/mysqlctl/replication.go

@@ -26,7 +26,6 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/mysql"
@@ -34,6 +33,7 @@ import (
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
 	"vitess.io/vitess/go/vt/hook"
+	"vitess.io/vitess/go/vt/log"
 )
 
 const (

go/vt/mysqlctl/schema.go

@@ -21,12 +21,12 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/sqlescape"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/mysqlctl/tmutils"
 
 	tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"

go/vt/mysqlctl/utils.go

@@ -17,7 +17,7 @@ limitations under the License.
 package mysqlctl
 
 import (
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 type MapFunc func(index int) error

go/vt/mysqlproxy/mysqlproxy.go

@@ -23,9 +23,8 @@ import (
 	"context"
 	"fmt"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/sqltypes"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/vttablet/queryservice"
 

go/vt/schemamanager/local_controller.go

@@ -24,8 +24,8 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // LocalController listens to the specified schema change dir and applies schema changes.

go/vt/schemamanager/plain_controller.go

@@ -20,9 +20,9 @@ import (
 	"encoding/json"
 	"strings"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
 )
 

go/vt/schemamanager/schemamanager.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
+	"vitess.io/vitess/go/vt/log"
 	querypb "vitess.io/vitess/go/vt/proto/query"
 )
 

go/vt/schemamanager/schemaswap/schema_swap.go

@@ -27,13 +27,13 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/concurrency"
 	"vitess.io/vitess/go/vt/discovery"
 	"vitess.io/vitess/go/vt/hook"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"

go/vt/schemamanager/ui_controller.go

@@ -22,8 +22,8 @@ import (
 	"net/http"
 	"strings"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // UIController handles schema events.

go/vt/servenv/grpc_auth.go

@@ -23,7 +23,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // Authenticator provides an interface to implement auth in Vitess in

go/vt/servenv/grpc_server.go

@@ -27,10 +27,10 @@ import (
 	"math"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/keepalive"
 	"vitess.io/vitess/go/vt/grpccommon"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/vttls"
 )
 

go/vt/servenv/grpc_server_auth_static.go

@@ -27,7 +27,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/servenv/pid_file.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var pidFile = flag.String("pid_file", "", "If set, the process will write its pid to the named file, and delete it on graceful shutdown.")

go/vt/servenv/pprof.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"runtime/pprof"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/servenv/run.go

@@ -22,9 +22,9 @@ import (
 	"net/url"
 	"time"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/event"
 	"vitess.io/vitess/go/proc"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/servenv/servenv.go

@@ -41,10 +41,10 @@ import (
 	// register the HTTP handlers for profiling
 	_ "net/http/pprof"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/event"
 	"vitess.io/vitess/go/netutil"
 	"vitess.io/vitess/go/stats"
+	"vitess.io/vitess/go/vt/log"
 
 	// register the proper init and shutdown hooks for logging
 	_ "vitess.io/vitess/go/vt/logutil"

go/vt/servenv/service_map.go

@@ -19,9 +19,8 @@ package servenv
 import (
 	"flag"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/flagutil"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/servenv/status.go

@@ -29,8 +29,8 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"vitess.io/vitess/go/acl"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/servenv/unix_socket.go

@@ -21,7 +21,7 @@ import (
 	"net"
 	"os"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 var (

go/vt/sqlparser/ast.go

@@ -24,9 +24,8 @@ import (
 	"io"
 	"strings"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/sqltypes"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/vterrors"
 
 	querypb "vitess.io/vitess/go/vt/proto/query"

go/vt/srvtopo/discover.go

@@ -19,10 +19,10 @@ package srvtopo
 import (
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/vt/concurrency"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 
 	querypb "vitess.io/vitess/go/vt/proto/query"

go/vt/srvtopo/resilient_server.go

@@ -24,10 +24,10 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"vitess.io/vitess/go/stats"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"

go/vt/tableacl/tableacl.go

@@ -25,11 +25,11 @@ import (
 	"strings"
 	"sync"
 
-	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 	"github.com/tchap/go-patricia/patricia"
 	"vitess.io/vitess/go/json2"
 	"vitess.io/vitess/go/vt/health"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/tableacl/acl"
 	"vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv"

go/vt/throttler/demo/throttler_demo.go

@@ -38,7 +38,7 @@ import (
 	querypb "vitess.io/vitess/go/vt/proto/query"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 // This file contains a demo binary that demonstrates how the resharding

go/vt/throttler/manager.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"sync"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 
 	throttlerdatapb "vitess.io/vitess/go/vt/proto/throttlerdata"
 )

go/vt/throttler/max_replication_lag_module.go

@@ -22,11 +22,11 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
 	"github.com/golang/protobuf/proto"
 
 	"vitess.io/vitess/go/sync2"
 	"vitess.io/vitess/go/vt/discovery"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo/topoproto"
 
 	throttlerdatapb "vitess.io/vitess/go/vt/proto/throttlerdata"

go/vt/throttler/throttler.go

@@ -33,9 +33,8 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/golang/glog"
-
 	"vitess.io/vitess/go/vt/discovery"
+	"vitess.io/vitess/go/vt/log"
 
 	throttlerdatapb "vitess.io/vitess/go/vt/proto/throttlerdata"
 )

go/vt/tlstest/tlstest.go

@@ -25,7 +25,7 @@ import (
 	"os/exec"
 	"path"
 
-	log "github.com/golang/glog"
+	"vitess.io/vitess/go/vt/log"
 )
 
 const (

go/vt/topo/consultopo/election.go

@@ -19,10 +19,10 @@ package consultopo
 import (
 	"path"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
 	"github.com/hashicorp/consul/api"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 )
 

go/vt/topo/consultopo/lock.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"path"
 
-	log "github.com/golang/glog"
 	"github.com/hashicorp/consul/api"
 	"golang.org/x/net/context"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 )
 

go/vt/topo/etcd2topo/election.go

@@ -20,9 +20,9 @@ import (
 	"path"
 
 	"github.com/coreos/etcd/clientv3"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 )
 

go/vt/topo/etcd2topo/lock.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/mvcc/mvccpb"
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 )
 

go/vt/topo/etcd2topo/watch.go

@@ -24,8 +24,8 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/mvcc/mvccpb"
 	"golang.org/x/net/context"
-	log "github.com/golang/glog"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 )
 

go/vt/topo/helpers/copy.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"sync"
 
-	log "github.com/golang/glog"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/vt/concurrency"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/topo"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"