Remove some uses of log15 (#45670)

Author: camdencheek

cmd/frontend/internal/cli/serve_cmd.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/getsentry/sentry-go"
 	"github.com/graph-gophers/graphql-go"
-	"github.com/inconshreveable/log15"
 	"github.com/keegancsmith/tmpfriend"
 	sglog "github.com/sourcegraph/log"
 	"github.com/throttled/throttled/v2/store/redigostore"
@@ -124,7 +123,7 @@ func Main(enterpriseSetupHook func(database.DB, conftypes.UnifiedWatchable) ente
 	observationCtx := observation.NewContext(logger)
 
 	if os.Getenv("SRC_DISABLE_OOBMIGRATION_VALIDATION") != "" {
-		log15.Warn("Skipping out-of-band migrations check")
+		logger.Warn("Skipping out-of-band migrations check")
 	} else {
 		outOfBandMigrationRunner := oobmigration.NewRunnerWithDB(observationCtx, db, oobmigration.RefreshInterval)
 
@@ -261,12 +260,12 @@ func Main(enterpriseSetupHook func(database.DB, conftypes.UnifiedWatchable) ente
 		return err
 	}
 
-	server, err := makeExternalAPI(db, schema, enterprise, rateLimitWatcher)
+	server, err := makeExternalAPI(db, logger, schema, enterprise, rateLimitWatcher)
 	if err != nil {
 		return err
 	}
 
-	internalAPI, err := makeInternalAPI(schema, db, enterprise, rateLimitWatcher)
+	internalAPI, err := makeInternalAPI(db, logger, schema, enterprise, rateLimitWatcher)
 	if err != nil {
 		return err
 	}
@@ -289,7 +288,7 @@ func Main(enterpriseSetupHook func(database.DB, conftypes.UnifiedWatchable) ente
 	return nil
 }
 
-func makeExternalAPI(db database.DB, schema *graphql.Schema, enterprise enterprise.Services, rateLimiter graphqlbackend.LimitWatcher) (goroutine.BackgroundRoutine, error) {
+func makeExternalAPI(db database.DB, logger sglog.Logger, schema *graphql.Schema, enterprise enterprise.Services, rateLimiter graphqlbackend.LimitWatcher) (goroutine.BackgroundRoutine, error) {
 	listener, err := httpserver.NewListener(httpAddr)
 	if err != nil {
 		return nil, err
@@ -323,13 +322,14 @@ func makeExternalAPI(db database.DB, schema *graphql.Schema, enterprise enterpri
 	}
 
 	server := httpserver.New(listener, httpServer, makeServerOptions()...)
-	log15.Debug("HTTP running", "on", httpAddr)
+	logger.Debug("HTTP running", sglog.String("on", httpAddr))
 	return server, nil
 }
 
 func makeInternalAPI(
-	schema *graphql.Schema,
 	db database.DB,
+	logger sglog.Logger,
+	schema *graphql.Schema,
 	enterprise enterprise.Services,
 	rateLimiter graphqlbackend.LimitWatcher,
 ) (goroutine.BackgroundRoutine, error) {
@@ -361,7 +361,7 @@ func makeInternalAPI(
 	}
 
 	server := httpserver.New(listener, httpServer, makeServerOptions()...)
-	log15.Debug("HTTP (internal) running", "on", httpAddrInternal)
+	logger.Debug("HTTP (internal) running", sglog.String("on", httpAddrInternal))
 	return server, nil
 }
 

enterprise/cmd/frontend/internal/authz/init.go

@@ -7,9 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/inconshreveable/log15"
-
 	"github.com/sourcegraph/log"
+
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/hooks"
@@ -124,7 +123,7 @@ func Init(
 
 		info, err := licensing.GetConfiguredProductLicenseInfo()
 		if err != nil {
-			log15.Error("Error reading license key for Sourcegraph subscription.", "err", err)
+			observationCtx.Logger.Error("Error reading license key for Sourcegraph subscription.", log.Error(err))
 			return []*graphqlbackend.Alert{{
 				TypeValue:    graphqlbackend.AlertTypeError,
 				MessageValue: "Error reading Sourcegraph license key. Check the logs for more information, or update the license key in the [**site configuration**](/site-admin/configuration).",
@@ -159,7 +158,7 @@ func Init(
 					return
 				}
 				if err != auth.ErrMustBeSiteAdmin {
-					log15.Error("Error checking current user is site admin", "err", err)
+					observationCtx.Logger.Error("Error checking current user is site admin", log.Error(err))
 					http.Error(w, "Error checking current user is site admin. Site admins may check the logs for more information.", http.StatusInternalServerError)
 					return
 				}
@@ -173,7 +172,7 @@ func Init(
 			// to save that DB lookup in most cases.
 			info, err := licensing.GetConfiguredProductLicenseInfo()
 			if err != nil {
-				log15.Error("Error reading license key for Sourcegraph subscription.", "err", err)
+				observationCtx.Logger.Error("Error reading license key for Sourcegraph subscription.", log.Error(err))
 				siteadminOrHandler(func() {
 					enforcement.WriteSubscriptionErrorResponse(w, http.StatusInternalServerError, "Error reading Sourcegraph license key", "Site admins may check the logs for more information. Update the license key in the [**site configuration**](/site-admin/configuration).")
 				})

enterprise/cmd/frontend/internal/licensing/init/init.go

@@ -136,7 +136,7 @@ func Init(
 	enterpriseServices.LicenseResolver = resolvers.LicenseResolver{}
 
 	goroutine.Go(func() {
-		licensing.StartMaxUserCount(&usersStore{
+		licensing.StartMaxUserCount(logger, &usersStore{
 			db: db,
 		})
 	})

enterprise/internal/authz/authz.go

@@ -7,8 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/inconshreveable/log15"
-
 	"github.com/sourcegraph/log"
 
 	"github.com/sourcegraph/sourcegraph/enterprise/internal/authz/bitbucketserver"
@@ -124,7 +122,7 @@ func ProvidersFromConfig(
 					PerforceConnection: c,
 				})
 			default:
-				log15.Error("ProvidersFromConfig", "error", errors.Errorf("unexpected connection type: %T", cfg))
+				logger.Error("ProvidersFromConfig", log.Error(errors.Errorf("unexpected connection type: %T", cfg)))
 				continue
 			}
 		}

enterprise/internal/licensing/user_count.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/gomodule/redigo/redis"
 
-	"github.com/sourcegraph/sourcegraph/internal/redispool"
+	"github.com/sourcegraph/log"
 
-	"github.com/inconshreveable/log15"
+	"github.com/sourcegraph/sourcegraph/internal/redispool"
 )
 
 var (
@@ -81,20 +81,20 @@ func getMaxUsers(c redis.Conn, key string) (int, string, error) {
 
 // checkMaxUsers runs periodically, and if a license key is in use, updates the
 // record of maximum count of user accounts in use.
-func checkMaxUsers(ctx context.Context, s UsersStore, signature string) error {
+func checkMaxUsers(ctx context.Context, logger log.Logger, s UsersStore, signature string) error {
 	if signature == "" {
 		// No license key is in use.
 		return nil
 	}
 
 	count, err := s.Count(ctx)
 	if err != nil {
-		log15.Error("licensing.checkMaxUsers: error getting user count", "error", err)
+		logger.Error("error getting user count", log.Error(err))
 		return err
 	}
 	err = setMaxUsers(signature, count)
 	if err != nil {
-		log15.Error("licensing.checkMaxUsers: error setting new max users", "error", err)
+		logger.Error("error setting new max users", log.Error(err))
 		return err
 	}
 	return nil
@@ -133,7 +133,7 @@ func ActualUserCountDate(ctx context.Context) (string, error) {
 }
 
 // StartMaxUserCount starts checking for a new count of max user accounts periodically.
-func StartMaxUserCount(s UsersStore) {
+func StartMaxUserCount(logger log.Logger, s UsersStore) {
 	if started {
 		panic("already started")
 	}
@@ -144,10 +144,10 @@ func StartMaxUserCount(s UsersStore) {
 	for {
 		_, signature, err := GetConfiguredProductLicenseInfoWithSignature()
 		if err != nil {
-			log15.Error("licensing.startMaxUserCount: error getting configured license info")
+			logger.Error("error getting configured license info", log.Error(err))
 		} else if signature != "" {
 			ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
-			_ = checkMaxUsers(ctx, s, signature) // updates global state on its own, can safely ignore return value
+			_ = checkMaxUsers(ctx, logger, s, signature) // updates global state on its own, can safely ignore return value
 			cancel()
 		}
 		time.Sleep(delay)