Use gitpod-io log package

components/blobserve/cmd/root.go

@@ -5,10 +5,12 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
 
+	containerd_log "github.com/containerd/containerd/log"
 	"github.com/spf13/cobra"
 
 	"github.com/gitpod-io/gitpod/blobserve/pkg/blobserve"
@@ -30,6 +32,9 @@ var rootCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		log.Init(ServiceName, Version, jsonLog, jsonLog)
+
+		// configure containerd log with gitpod-io configuration
+		containerd_log.WithLogger(context.Background(), log.Log)
 	},
 }
 

components/common-go/log/redact_test.go

@@ -2,12 +2,10 @@
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License-AGPL.txt in the project root for license information.
 
-package log_test
+package log
 
 import (
 	"testing"
-
-	"github.com/gitpod-io/gitpod/common-go/log"
 )
 
 func TestRedactJSON(t *testing.T) {
@@ -22,7 +20,7 @@ func TestRedactJSON(t *testing.T) {
 	}
 
 	for i, test := range tests {
-		res, err := log.RedactJSON([]byte(test.Input))
+		res, err := RedactJSON([]byte(test.Input))
 		if err != nil {
 			t.Errorf("test %d failed: %v", i, err)
 			continue

components/ee/ws-scheduler/cmd/run.go

@@ -13,9 +13,9 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/pprof"
 	"github.com/gitpod-io/gitpod/ws-scheduler/pkg/scaler"
 	sched "github.com/gitpod-io/gitpod/ws-scheduler/pkg/scheduler"

components/ee/ws-scheduler/pkg/scheduler/strategy.go

@@ -9,11 +9,11 @@ import (
 	"sort"
 	"time"
 
-	log "github.com/sirupsen/logrus"
 	"golang.org/x/xerrors"
 	corev1 "k8s.io/api/core/v1"
 
 	wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes"
+	"github.com/gitpod-io/gitpod/common-go/log"
 )
 
 // StrategyName is the type that identifies strategies

components/ws-daemon/cmd/client-init.go

@@ -8,9 +8,9 @@ import (
 	"context"
 
 	"github.com/alecthomas/repr"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	"github.com/gitpod-io/gitpod/common-go/log"
 	csapi "github.com/gitpod-io/gitpod/content-service/api"
 	"github.com/gitpod-io/gitpod/ws-daemon/api"
 )

components/ws-manager/cmd/root.go

@@ -11,16 +11,17 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/spf13/cobra"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+
 	"github.com/gitpod-io/gitpod/common-go/grpc"
 	wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes"
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
 	"github.com/gitpod-io/gitpod/content-service/pkg/storage"
 	"github.com/gitpod-io/gitpod/ws-manager/pkg/manager"
-	"github.com/spf13/cobra"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
 var (

dev/poolkeeper/cmd/root.go

@@ -9,15 +9,14 @@ import (
 	"fmt"
 	"os"
 
-	wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
+	wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes"
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
-
 	"github.com/gitpod-io/gitpod/poolkeeper/pkg/poolkeeper"
 )
 

dev/poolkeeper/cmd/run.go

@@ -9,9 +9,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/poolkeeper/pkg/poolkeeper"
 )
 

install/installer/cmd/bash.go

@@ -10,9 +10,10 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/gitpod-io/installer/pkg/sources"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/installer/pkg/sources"
 )
 
 // bashCmd represents the gcp command

install/installer/pkg/gcp/gcp.go

@@ -13,9 +13,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/gitpod-io/installer/pkg/terraform"
 	"github.com/gitpod-io/installer/pkg/ui"
-	log "github.com/sirupsen/logrus"
 )
 
 var availableRegions = []string{