[WIP] Allow logging to be configured by logfile

cmd/armada-load-tester/cmd/loadtest.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/pkg/client"
 	"github.com/armadaproject/armada/pkg/client/domain"
 	"github.com/armadaproject/armada/pkg/client/util"
@@ -72,7 +72,7 @@ var loadtestCmd = &cobra.Command{
 		loadTestSpec := &domain.LoadTestSpecification{}
 		err := util.BindJsonOrYaml(filePath, loadTestSpec)
 		if err != nil {
-			log.Error(err)
+			log.Error(err.Error())
 			os.Exit(1)
 		}
 

cmd/armada-load-tester/cmd/root.go

@@ -3,9 +3,9 @@ package cmd
 import (
 	"os"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/pkg/client"
 )
 
@@ -28,7 +28,7 @@ The location of this file can be passed in using --config argument or picked fro
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		log.Error(err)
+		log.Error(err.Error())
 		os.Exit(1)
 	}
 }
@@ -37,7 +37,7 @@ var cfgFile string
 
 func initConfig() {
 	if err := client.LoadCommandlineArgsFromConfigFile(cfgFile); err != nil {
-		log.Error(err)
+		log.Error(err.Error())
 		os.Exit(1)
 	}
 }

cmd/binoculars/main.go

@@ -8,7 +8,6 @@ import (
 	"syscall"
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
@@ -19,6 +18,7 @@ import (
 	"github.com/armadaproject/armada/internal/common/armadacontext"
 	gateway "github.com/armadaproject/armada/internal/common/grpc"
 	"github.com/armadaproject/armada/internal/common/health"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/common/profiling"
 	api "github.com/armadaproject/armada/pkg/api/binoculars"
 )
@@ -35,7 +35,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	log.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.BinocularsConfig

cmd/eventingester/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/eventingester"
 
 	"github.com/spf13/pflag"
@@ -24,7 +25,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	logging.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.EventIngesterConfiguration

cmd/executor/main.go

@@ -7,13 +7,13 @@ import (
 	"syscall"
 
 	"github.com/prometheus/client_golang/prometheus"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
 	"github.com/armadaproject/armada/internal/common"
 	"github.com/armadaproject/armada/internal/common/armadacontext"
 	"github.com/armadaproject/armada/internal/common/health"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/common/profiling"
 	"github.com/armadaproject/armada/internal/executor"
 	"github.com/armadaproject/armada/internal/executor/configuration"
@@ -31,7 +31,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	log.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.ExecutorConfiguration
@@ -61,7 +61,7 @@ func main() {
 	)
 	defer shutdownMetricServer()
 
-	shutdown, wg := executor.StartUp(armadacontext.Background(), log.NewEntry(log.StandardLogger()), config)
+	shutdown, wg := executor.StartUp(armadacontext.Background(), config)
 	go func() {
 		<-shutdownChannel
 		shutdown()

cmd/fakeexecutor/main.go

@@ -5,12 +5,12 @@ import (
 	"os/signal"
 	"syscall"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
 	"github.com/armadaproject/armada/internal/common"
 	"github.com/armadaproject/armada/internal/common/armadacontext"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/common/profiling"
 	"github.com/armadaproject/armada/internal/executor/configuration"
 	"github.com/armadaproject/armada/internal/executor/fake"
@@ -29,7 +29,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	log.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.ExecutorConfiguration
@@ -54,7 +54,7 @@ func main() {
 	shutdownMetricServer := common.ServeMetrics(config.Metric.Port)
 	defer shutdownMetricServer()
 
-	shutdown, wg := fake.StartUp(config, nodes)
+	shutdown, wg := fake.StartUp(armadacontext.Background(), config, nodes)
 	go func() {
 		<-shutdownChannel
 		shutdown()

cmd/lookoutingesterv2/dbloadtester/main.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"sigs.k8s.io/yaml"
 
 	"github.com/armadaproject/armada/internal/common"
 	"github.com/armadaproject/armada/internal/common/app"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/lookoutingesterv2/configuration"
 	"github.com/armadaproject/armada/internal/lookoutingesterv2/dbloadtester"
 )
@@ -45,7 +45,7 @@ const ReportTemplate string = `
 `
 
 func main() {
-	common.ConfigureLogging()
+	log.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.LookoutIngesterV2Configuration

cmd/lookoutingesterv2/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
 	"github.com/armadaproject/armada/internal/common"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/lookoutingesterv2"
 	"github.com/armadaproject/armada/internal/lookoutingesterv2/benchmark"
 	"github.com/armadaproject/armada/internal/lookoutingesterv2/configuration"
@@ -27,7 +27,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	log.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.LookoutIngesterV2Configuration

cmd/lookoutv2/main.go

@@ -5,14 +5,14 @@ import (
 	"os/signal"
 	"syscall"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"k8s.io/utils/clock"
 
 	"github.com/armadaproject/armada/internal/common"
 	"github.com/armadaproject/armada/internal/common/armadacontext"
 	"github.com/armadaproject/armada/internal/common/database"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/common/profiling"
 	"github.com/armadaproject/armada/internal/lookoutv2"
 	"github.com/armadaproject/armada/internal/lookoutv2/configuration"
@@ -117,7 +117,7 @@ func prune(ctx *armadacontext.Context, config configuration.LookoutV2Config) {
 }
 
 func main() {
-	common.ConfigureLogging()
+	log.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config configuration.LookoutV2Config
@@ -148,7 +148,7 @@ func main() {
 	restapi.UIConfig = config.UIConfig
 
 	if err := lookoutv2.Serve(config); err != nil {
-		log.Error(err)
+		log.Error(err.Error())
 		os.Exit(1)
 	}
 }

cmd/scheduler/cmd/migrate_database.go

@@ -4,11 +4,11 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/armadaproject/armada/internal/common/armadacontext"
 	"github.com/armadaproject/armada/internal/common/database"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	schedulerdb "github.com/armadaproject/armada/internal/scheduler/database"
 )
 

cmd/scheduler/main.go

@@ -6,10 +6,11 @@ import (
 
 	"github.com/armadaproject/armada/cmd/scheduler/cmd"
 	"github.com/armadaproject/armada/internal/common"
+	"github.com/armadaproject/armada/internal/common/logging"
 )
 
 func main() {
-	common.ConfigureLogging()
+	logging.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 	if err := cmd.RootCmd().Execute(); err != nil {
 		os.Exit(1)

cmd/scheduleringester/main.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/armadaproject/armada/internal/common/logging"
+
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
@@ -24,7 +26,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	logging.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	var config scheduleringester.Configuration

cmd/server/main.go

@@ -8,7 +8,6 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
@@ -17,6 +16,7 @@ import (
 	gateway "github.com/armadaproject/armada/internal/common/grpc"
 	"github.com/armadaproject/armada/internal/common/health"
 	"github.com/armadaproject/armada/internal/common/logging"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/common/profiling"
 	"github.com/armadaproject/armada/internal/server"
 	"github.com/armadaproject/armada/internal/server/configuration"
@@ -35,7 +35,7 @@ func init() {
 }
 
 func main() {
-	common.ConfigureLogging()
+	logging.MustConfigureApplicationLogging()
 	common.BindCommandlineArguments()
 
 	// TODO Load relevant config in one place: don't use viper here and in LoadConfig.
@@ -117,6 +117,6 @@ func main() {
 	}()
 
 	if err := g.Wait(); err != nil {
-		logging.WithStacktrace(log.NewEntry(log.StandardLogger()), err).Error("Armada server shut down")
+		logging.WithStacktrace(err).Error("Armada server shut down")
 	}
 }

cmd/simulator/cmd/root.go

@@ -6,13 +6,12 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/armadaproject/armada/internal/scheduler/simulator/sink"
-
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/armadaproject/armada/internal/common/armadacontext"
+	log "github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/internal/scheduler/simulator"
+	"github.com/armadaproject/armada/internal/scheduler/simulator/sink"
 	"github.com/armadaproject/armada/internal/scheduler/testfixtures"
 )
 
@@ -139,11 +138,11 @@ func runSimulations(cmd *cobra.Command, args []string) error {
 		log.Infof("Will write profiling information to %s", profilingFile)
 		f, err := os.Create(profilingFile)
 		if err != nil {
-			log.Fatal(err)
+			log.Fatal(err.Error())
 		}
 		err = pprof.StartCPUProfile(f)
 		if err != nil {
-			log.Fatal(err)
+			log.Fatal(err.Error())
 		}
 		defer pprof.StopCPUProfile()
 	}

config/logging.yaml

@@ -0,0 +1,13 @@
+console:
+  level: INFO
+  format: text
+file:
+  enabled: true
+  level: INFO
+  format: json
+  logfile: app.log
+  rotation:
+    maxSizeMb: 5
+    maxBackups: 3
+    maxAgeDays: 7
+    compress: false