Add trc1log wrapped logger (#128)

palantir · Mar 26, 2021 · c8ffecf · c8ffecf
1 parent a82a6e1
commit c8ffecf
Show file tree

Hide file tree

Showing 16 changed files with 426 additions and 346 deletions.
diff --git a/changelog/@unreleased/pr-128.v2.yml b/changelog/@unreleased/pr-128.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Add trc1log wrapped logger
+  links:
+  - https://github.com/palantir/witchcraft-go-logging/pull/128
diff --git a/wlog-glog/internal/marshalers/marshalers.go b/wlog-glog/internal/marshalers/marshalers.go
@@ -18,13 +18,11 @@ import (
 	"reflect"
 
 	"github.com/palantir/witchcraft-go-logging/conjure/witchcraft/api/logging"
-	"github.com/palantir/witchcraft-go-tracing/wtracing"
 )
 
 type encoderFunc func(key string, val interface{}) string
 
 var encoders = map[reflect.Type]encoderFunc{
-	reflect.TypeOf(wtracing.SpanModel{}): marshalWTracingSpanModel,
 	reflect.TypeOf(logging.Diagnostic{}): marshalLoggingDiagnostic,
 }
 

diff --git a/wlog-glog/internal/marshalers/wtracing_spanmodel.go b/wlog-glog/internal/marshalers/wtracing_spanmodel.go
diff --git a/wlog-glog/logger_test.go b/wlog-glog/logger_test.go
@@ -210,7 +210,7 @@ func TestWrapped1Log(t *testing.T) {
 
 	entityName := "entity"
 	entityVersion := "version"
-	for _, tc := range wrapped1logtests.TestCases(entityName, entityVersion) {
+	for _, tc := range wrapped1logtests.Svc1TestCases(entityName, entityVersion) {
 		// TODO: test output
 		logger := wrapped1log.NewFromProvider(
 			os.Stdout,

diff --git a/wlog-zap/internal/marshalers/marshalers.go b/wlog-zap/internal/marshalers/marshalers.go
@@ -18,14 +18,12 @@ import (
 	"reflect"
 
 	"github.com/palantir/witchcraft-go-logging/conjure/witchcraft/api/logging"
-	"github.com/palantir/witchcraft-go-tracing/wtracing"
 	"go.uber.org/zap/zapcore"
 )
 
 type encoderFunc func(key string, val interface{}) zapcore.Field
 
 var encoders = map[reflect.Type]encoderFunc{
-	reflect.TypeOf(wtracing.SpanModel{}): marshalWTracingSpanModel,
 	reflect.TypeOf(logging.Diagnostic{}): marshalLoggingDiagnostic,
 }
 

diff --git a/wlog-zap/internal/marshalers/wtracing_spanmodel.go b/wlog-zap/internal/marshalers/wtracing_spanmodel.go
diff --git a/wlog-zap/logger_test.go b/wlog-zap/logger_test.go
@@ -117,3 +117,15 @@ func TestWrapped1LogSvc1Log(t *testing.T) {
 			return wrapped1log.NewFromProvider(w, level, zapimpl.LoggerProvider(), entityName, entityVersion).Service(svc1log.Origin(origin))
 		})
 }
+
+func TestWrapped1LogTrc1Log(t *testing.T) {
+	entityName := "entity"
+	entityVersion := "version"
+	wrapped1logtests.Trc1LogJSONTestSuite(
+		t,
+		entityName,
+		entityVersion,
+		func(w io.Writer) trc1log.Logger {
+			return wrapped1log.NewFromProvider(w, wlog.InfoLevel, zapimpl.LoggerProvider(), entityName, entityVersion).Trace()
+		})
+}
diff --git a/wlog-zerolog/internal/marshalers/marshalers.go b/wlog-zerolog/internal/marshalers/marshalers.go
@@ -18,7 +18,6 @@ import (
 	"reflect"
 
 	"github.com/palantir/witchcraft-go-logging/conjure/witchcraft/api/logging"
-	"github.com/palantir/witchcraft-go-tracing/wtracing"
 	"github.com/rs/zerolog"
 )
 
@@ -37,7 +36,6 @@ func (f logArrayMarshalerFn) MarshalZerologArray(a *zerolog.Array) {
 }
 
 var encoders = map[reflect.Type]encoderFunc{
-	reflect.TypeOf(wtracing.SpanModel{}): marshalWTracingSpanModel,
 	reflect.TypeOf(logging.Diagnostic{}): marshalLoggingDiagnostic,
 }
 

diff --git a/wlog-zerolog/internal/marshalers/wtracing_spanmodel.go b/wlog-zerolog/internal/marshalers/wtracing_spanmodel.go