Initial import from go-kit/kit (#1)

* Initial import

* GitHub Actions for CI

* gofmt

* Satisfy staticcheck

.github/workflows/test.yml

@@ -0,0 +1,37 @@
+on: push
+name: Test
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.16.x]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Install staticcheck
+      run: go install honnef.co/go/tools/cmd/staticcheck@latest
+      shell: bash
+    - name: Install golint
+      run: go install golang.org/x/lint/golint@latest
+      shell: bash
+    - name: Update PATH
+      run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+      shell: bash
+    - name: Checkout code
+      uses: actions/checkout@v1
+    - name: Fmt
+      if: matrix.platform != 'windows-latest' # :(
+      run: "diff <(gofmt -d .) <(printf '')"
+      shell: bash
+    - name: Vet
+      run: go vet ./...
+    - name: Staticcheck
+      run: staticcheck ./...
+    - name: Lint
+      run: golint ./...
+    - name: Test
+      run: go test -race ./...

.gitignore

@@ -0,0 +1,15 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Go kit
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,3 +1,7 @@
+<h3 align="center">:warning: &nbsp; PRE-RELEASE &nbsp; :warning:</h3>
+<h4 align="center">DO NOT IMPORT THIS MODULE</h4>
+<h4 align="center">YOUR PROJECT WILL BREAK</h4>
+
 # package log
 
 `package log` provides a minimal interface for structured logging in services.
@@ -66,7 +70,7 @@ Redirect stdlib logger to Go kit logger.
 import (
 	"os"
 	stdlog "log"
-	kitlog "github.com/go-kit/kit/log"
+	kitlog "github.com/go-kit/log"
 )
 
 func main() {
@@ -105,7 +109,7 @@ logger.Log("msg", "hello")
 
 ## Levels
 
-Log levels are supported via the [level package](https://godoc.org/github.com/go-kit/kit/log/level).
+Log levels are supported via the [level package](https://godoc.org/github.com/go-kit/log/level).
 
 ## Supported output formats
 
@@ -136,11 +140,11 @@ Also, please see
 to review historical conversations about package log and the Logger interface.
 
 Value-add packages and suggestions,
-like improvements to [the leveled logger](https://godoc.org/github.com/go-kit/kit/log/level),
+like improvements to [the leveled logger](https://godoc.org/github.com/go-kit/log/level),
 are of course welcome. Good proposals should
 
-- Be composable with [contextual loggers](https://godoc.org/github.com/go-kit/kit/log#With),
-- Not break the behavior of [log.Caller](https://godoc.org/github.com/go-kit/kit/log#Caller) in any wrapped contextual loggers, and
+- Be composable with [contextual loggers](https://godoc.org/github.com/go-kit/log#With),
+- Not break the behavior of [log.Caller](https://godoc.org/github.com/go-kit/log#Caller) in any wrapped contextual loggers, and
 - Be friendly to packages that accept only an unadorned log.Logger.
 
 ## Benchmarks & comparisons

benchmark_test.go

@@ -3,7 +3,7 @@ package log_test
 import (
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 func benchmarkRunner(b *testing.B, logger log.Logger, f func(log.Logger)) {

concurrency_test.go

@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 // These test are designed to be run with the race detector.

example_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 func Example_basic() {

go.mod

@@ -0,0 +1,8 @@
+module github.com/go-kit/log
+
+go 1.16
+
+require (
+	github.com/go-logfmt/logfmt v0.5.0
+	github.com/go-stack/stack v1.8.0
+)

go.sum

@@ -0,0 +1,4 @@
+github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=

json_logger_test.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 func TestJSONLoggerCaller(t *testing.T) {

level/benchmark_test.go

@@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 )
 
 func Benchmark(b *testing.B) {

level/example_test.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"os"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 )
 
 func Example_basic() {

level/level.go

@@ -1,6 +1,6 @@
 package level
 
-import "github.com/go-kit/kit/log"
+import "github.com/go-kit/log"
 
 // Error returns a logger that includes a Key/ErrorValue pair.
 func Error(logger log.Logger) log.Logger {

level/level_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 )
 
 func TestVariousLevels(t *testing.T) {

log.go

@@ -163,7 +163,7 @@ func (l *context) Log(keyvals ...interface{}) error {
 	}
 	kvs = append(kvs, l.sKeyvals...)
 	if l.sHasValuer {
-		bindValues(kvs[len(kvs) - len(l.sKeyvals):])
+		bindValues(kvs[len(kvs)-len(l.sKeyvals):])
 	}
 	return l.logger.Log(kvs...)
 }

log_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/go-stack/stack"
 )
 

logfmt_logger_test.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/go-logfmt/logfmt"
 )
 

nop_logger_test.go

@@ -3,7 +3,7 @@ package log_test
 import (
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 func TestNopLogger(t *testing.T) {

stdlib_test.go

@@ -53,11 +53,11 @@ func TestStdLibAdapterExtraction(t *testing.T) {
 	logger := NewLogfmtLogger(buf)
 	writer := NewStdlibAdapter(logger)
 	for input, want := range map[string]string{
-		"hello":                                            "msg=hello\n",
-		"2009/01/23: hello":                                "ts=2009/01/23 msg=hello\n",
-		"2009/01/23 01:23:23: hello":                       "ts=\"2009/01/23 01:23:23\" msg=hello\n",
-		"01:23:23: hello":                                  "ts=01:23:23 msg=hello\n",
-		"2009/01/23 01:23:23.123123: hello":                "ts=\"2009/01/23 01:23:23.123123\" msg=hello\n",
+		"hello":                             "msg=hello\n",
+		"2009/01/23: hello":                 "ts=2009/01/23 msg=hello\n",
+		"2009/01/23 01:23:23: hello":        "ts=\"2009/01/23 01:23:23\" msg=hello\n",
+		"01:23:23: hello":                   "ts=01:23:23 msg=hello\n",
+		"2009/01/23 01:23:23.123123: hello": "ts=\"2009/01/23 01:23:23.123123\" msg=hello\n",
 		"2009/01/23 01:23:23.123123 /a/b/c/d.go:23: hello": "ts=\"2009/01/23 01:23:23.123123\" caller=/a/b/c/d.go:23 msg=hello\n",
 		"01:23:23.123123 /a/b/c/d.go:23: hello":            "ts=01:23:23.123123 caller=/a/b/c/d.go:23 msg=hello\n",
 		"2009/01/23 01:23:23 /a/b/c/d.go:23: hello":        "ts=\"2009/01/23 01:23:23\" caller=/a/b/c/d.go:23 msg=hello\n",

sync_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 func TestSwapLogger(t *testing.T) {
@@ -58,7 +58,7 @@ func TestSwapLoggerConcurrency(t *testing.T) {
 }
 
 func TestSyncLoggerConcurrency(t *testing.T) {
-	var w io.Writer
+	var w io.Writer //lint:ignore S1021 I prefer this
 	w = &bytes.Buffer{}
 	logger := log.NewLogfmtLogger(w)
 	logger = log.NewSyncLogger(logger)

syslog/example_test.go

@@ -9,9 +9,9 @@ import (
 
 	gosyslog "log/syslog"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
-	"github.com/go-kit/kit/log/syslog"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
+	"github.com/go-kit/log/syslog"
 )
 
 func ExampleNewSyslogLogger_defaultPrioritySelector() {

syslog/syslog.go

@@ -11,8 +11,8 @@ import (
 
 	gosyslog "log/syslog"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 )
 
 // SyslogWriter is an interface wrapping stdlib syslog Writer.

syslog/syslog_test.go

@@ -11,8 +11,8 @@ import (
 
 	gosyslog "log/syslog"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
 )
 
 func TestSyslogLoggerDefaultPrioritySelector(t *testing.T) {

term/colorlogger.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 // Color represents an ANSI color. The zero value is Default.

term/colorlogger_test.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/term"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/term"
 )
 
 func TestColorLogger(t *testing.T) {

term/colorwriter_windows.go

@@ -45,7 +45,7 @@ func (w *colorWriter) Write(data []byte) (n int, err error) {
 	er := bytes.NewBuffer(data)
 loop:
 	for {
-		r1, _, err := procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
+		r1, _, _ := procGetConsoleScreenBufferInfo.Call(uintptr(w.handle), uintptr(unsafe.Pointer(&csbi)))
 		if r1 == 0 {
 			break loop
 		}
@@ -161,22 +161,22 @@ const (
 )
 
 type (
-	wchar uint16
-	short int16
-	dword uint32
-	word  uint16
+	wchar uint16 //lint:ignore U1000 unused
+	short int16  //lint:ignore U1000 unused
+	dword uint32 //lint:ignore U1000 unused
+	word  uint16 //lint:ignore U1000 unused
 )
 
 type coord struct {
-	x short
-	y short
+	x short //lint:ignore U1000 unused
+	y short //lint:ignore U1000 unused
 }
 
 type smallRect struct {
-	left   short
-	top    short
-	right  short
-	bottom short
+	left   short //lint:ignore U1000 unused
+	top    short //lint:ignore U1000 unused
+	right  short //lint:ignore U1000 unused
+	bottom short //lint:ignore U1000 unused
 }
 
 type consoleScreenBufferInfo struct {

term/example_test.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"os"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/term"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/term"
 )
 
 func ExampleNewLogger_redErrors() {

term/term.go

@@ -4,7 +4,7 @@ package term
 import (
 	"io"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 // NewLogger returns a Logger that takes advantage of terminal features if