alias log package to github.com/containerd/log v0.1.0

This "soft" deprecates the package, but keeps the local uses of the package,
which can make backporting this to release-branches easier (we can
still move all uses in those branches as well though).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

log/logtest/context.go

@@ -1,56 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package logtest
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/containerd/containerd/log"
-	"github.com/sirupsen/logrus"
-)
-
-// WithT adds a logging hook for the given test
-// Changes debug level to debug, clears output, and
-// outputs all log messages as test logs.
-func WithT(ctx context.Context, t testing.TB) context.Context {
-	// Create a new logger to avoid adding hooks from multiple tests
-	l := logrus.New()
-
-	// Increase debug level for tests
-	l.SetLevel(logrus.DebugLevel)
-	l.SetOutput(io.Discard)
-	l.SetReportCaller(true)
-
-	// Add testing hook
-	l.AddHook(&testHook{
-		t: t,
-		fmt: &logrus.TextFormatter{
-			DisableColors:   true,
-			TimestampFormat: log.RFC3339NanoFixed,
-			CallerPrettyfier: func(frame *runtime.Frame) (string, string) {
-				return filepath.Base(frame.Function), fmt.Sprintf("%s:%d", frame.File, frame.Line)
-			},
-		},
-	})
-
-	return log.WithLogger(ctx, logrus.NewEntry(l).WithField("testcase", t.Name()))
-}

log/logtest/context_deprecated.go

@@ -17,34 +17,15 @@
 package logtest
 
 import (
-	"bytes"
-	"sync"
+	"context"
 	"testing"
 
-	"github.com/sirupsen/logrus"
+	"github.com/containerd/log/logtest"
 )
 
-type testHook struct {
-	t   testing.TB
-	fmt logrus.Formatter
-	mu  sync.Mutex
-}
-
-func (*testHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
-
-func (h *testHook) Fire(e *logrus.Entry) error {
-	s, err := h.fmt.Format(e)
-	if err != nil {
-		return err
-	}
-
-	// Because the logger could be called from multiple goroutines,
-	// but t.Log() is not designed for.
-	h.mu.Lock()
-	defer h.mu.Unlock()
-	h.t.Log(string(bytes.TrimRight(s, "\n")))
-
-	return nil
+// WithT adds a logging hook for the given test
+// Changes debug level to debug, clears output, and
+// outputs all log messages as test logs.
+func WithT(ctx context.Context, t testing.TB) context.Context {
+	return logtest.WithT(ctx, t)
 }