event: move all the logging adapters into the adapters directory
Change-Id: I47e3bfc33acf9ac37ca040e1515bd4d5f7209cc4
Reviewed-on: https://go-review.googlesource.com/c/exp/+/325575
Trust: Ian Cottrell <iancottrell@google.com>
Run-TryBot: Ian Cottrell <iancottrell@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
diff --git a/event/logging/egokit/gokit.go b/event/adapter/gokit/gokit.go
similarity index 93%
rename from event/logging/egokit/gokit.go
rename to event/adapter/gokit/gokit.go
index 99f42c1..b51fab4 100644
--- a/event/logging/egokit/gokit.go
+++ b/event/adapter/gokit/gokit.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// Package egokit provides a go-kit logger for events.
-package egokit
+// Package gokit provides a go-kit logger for events.
+package gokit
import (
"context"
diff --git a/event/logging/egokit/gokit_test.go b/event/adapter/gokit/gokit_test.go
similarity index 90%
rename from event/logging/egokit/gokit_test.go
rename to event/adapter/gokit/gokit_test.go
index d9e5677..3e88d3b 100644
--- a/event/logging/egokit/gokit_test.go
+++ b/event/adapter/gokit/gokit_test.go
@@ -4,7 +4,7 @@
// +build !disable_events
-package egokit_test
+package gokit_test
import (
"testing"
@@ -12,12 +12,12 @@
"github.com/google/go-cmp/cmp"
"golang.org/x/exp/event"
"golang.org/x/exp/event/adapter/eventtest"
+ "golang.org/x/exp/event/adapter/gokit"
"golang.org/x/exp/event/keys"
- "golang.org/x/exp/event/logging/egokit"
)
func Test(t *testing.T) {
- log := egokit.NewLogger()
+ log := gokit.NewLogger()
ctx, h := eventtest.NewCapture()
log.Log(ctx, "msg", "mess", "level", 1, "name", "n/m", "traceID", 17, "resource", "R")
want := []event.Event{{
diff --git a/event/logging/elogr/logr.go b/event/adapter/logr/logr.go
similarity index 95%
rename from event/logging/elogr/logr.go
rename to event/adapter/logr/logr.go
index 5f45216..115a4a3 100644
--- a/event/logging/elogr/logr.go
+++ b/event/adapter/logr/logr.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// Package elogr is a logr implementation that uses events.
-package elogr
+// Package logr is a logr implementation that uses events.
+package logr
import (
"context"
@@ -113,5 +113,6 @@
}
func convertVerbosity(v int) event.Label {
+ //TODO: this needs to be more complicated, v decreases with increasing severity
return severity.Of(severity.Level(v))
}
diff --git a/event/logging/elogr/logr_test.go b/event/adapter/logr/logr_test.go
similarity index 93%
rename from event/logging/elogr/logr_test.go
rename to event/adapter/logr/logr_test.go
index f4b00d2..29599c5 100644
--- a/event/logging/elogr/logr_test.go
+++ b/event/adapter/logr/logr_test.go
@@ -4,7 +4,7 @@
// +build !disable_events
-package elogr_test
+package logr_test
import (
"testing"
@@ -12,8 +12,8 @@
"github.com/google/go-cmp/cmp"
"golang.org/x/exp/event"
"golang.org/x/exp/event/adapter/eventtest"
+ elogr "golang.org/x/exp/event/adapter/logr"
"golang.org/x/exp/event/keys"
- "golang.org/x/exp/event/logging/elogr"
"golang.org/x/exp/event/severity"
)
diff --git a/event/logging/elogrus/logrus.go b/event/adapter/logrus/logrus.go
similarity index 96%
rename from event/logging/elogrus/logrus.go
rename to event/adapter/logrus/logrus.go
index 0fc9567..fe21fee 100644
--- a/event/logging/elogrus/logrus.go
+++ b/event/adapter/logrus/logrus.go
@@ -4,7 +4,7 @@
// +build !disable_events
-// Package elogrus provides a logrus Formatter for events.
+// Package logrus provides a logrus Formatter for events.
// To use for the global logger:
// logrus.SetFormatter(elogrus.NewFormatter(exporter))
// logrus.SetOutput(io.Discard)
@@ -14,7 +14,7 @@
//
// If you call elogging.SetExporter, then you can pass nil
// for the exporter above and it will use the global one.
-package elogrus
+package logrus
import (
"context"
diff --git a/event/logging/elogrus/logrus_test.go b/event/adapter/logrus/logrus_test.go
similarity index 94%
rename from event/logging/elogrus/logrus_test.go
rename to event/adapter/logrus/logrus_test.go
index b0044d3..efbac64 100644
--- a/event/logging/elogrus/logrus_test.go
+++ b/event/adapter/logrus/logrus_test.go
@@ -4,7 +4,7 @@
// +build !disable_events
-package elogrus_test
+package logrus_test
import (
"io"
@@ -15,8 +15,8 @@
"github.com/sirupsen/logrus"
"golang.org/x/exp/event"
"golang.org/x/exp/event/adapter/eventtest"
+ elogrus "golang.org/x/exp/event/adapter/logrus"
"golang.org/x/exp/event/keys"
- "golang.org/x/exp/event/logging/elogrus"
"golang.org/x/exp/event/severity"
)
diff --git a/event/logging/ezap/zap.go b/event/adapter/zap/zap.go
similarity index 98%
rename from event/logging/ezap/zap.go
rename to event/adapter/zap/zap.go
index 1e8774b..de8d603 100644
--- a/event/logging/ezap/zap.go
+++ b/event/adapter/zap/zap.go
@@ -4,13 +4,13 @@
// +build !disable_events
-// ezap provides an implementation of zapcore.Core for events.
+// zap provides an implementation of zapcore.Core for events.
// To use globally:
// zap.ReplaceGlobals(zap.New(NewCore(exporter)))
//
// If you call elogging.SetExporter, then you can pass nil
// for the exporter above and it will use the global one.
-package ezap
+package zap
import (
"context"
diff --git a/event/logging/ezap/zap_test.go b/event/adapter/zap/zap_test.go
similarity index 94%
rename from event/logging/ezap/zap_test.go
rename to event/adapter/zap/zap_test.go
index 0696e59..ffc0c67 100644
--- a/event/logging/ezap/zap_test.go
+++ b/event/adapter/zap/zap_test.go
@@ -4,7 +4,7 @@
// +build !disable_events
-package ezap_test
+package zap_test
import (
"testing"
@@ -14,8 +14,8 @@
"go.uber.org/zap"
"golang.org/x/exp/event"
"golang.org/x/exp/event/adapter/eventtest"
+ ezap "golang.org/x/exp/event/adapter/zap"
"golang.org/x/exp/event/keys"
- "golang.org/x/exp/event/logging/ezap"
"golang.org/x/exp/event/severity"
)
