Merge pull request #264 from xmidt-org/feature/add-trust-to-logs

Feature/add trust to logs

token/factory.go

@@ -68,6 +68,7 @@ func (f *factory) NewToken(ctx context.Context, r *Request) (string, error) {
 		return "", err
 	}
 
+	r.Logger.Info("new token", zap.Any("trust", merged[ClaimTrust]))
 	token := jwt.NewWithClaims(f.method, jwt.MapClaims(merged))
 	pair := f.pair.Load().(key.Pair)
 	token.Header["kid"] = pair.KID()

token/factory_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/xmidt-org/themis/key"
 	"github.com/xmidt-org/themis/random"
+	"go.uber.org/zap"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -72,7 +73,7 @@ func testNewFactorySuccess(t *testing.T) {
 	require.NoError(err)
 	require.NotNil(factory)
 
-	token, err := factory.NewToken(context.Background(), new(Request))
+	token, err := factory.NewToken(context.Background(), &Request{Logger: zap.NewNop()})
 	require.NoError(err)
 	assert.True(len(token) > 0)
 }

xhttp/xhttpserver/server.go

@@ -58,6 +58,9 @@ func NewServerChain(o Options, l *zap.Logger, fbs ...sallusthttp.FieldBuilder) a
 	bs.Add(func(r *http.Request, l *zap.Logger) *zap.Logger {
 		return l.With(zap.String("userAgent", r.UserAgent()))
 	})
+	bs.Add(func(r *http.Request, l *zap.Logger) *zap.Logger {
+		return l.With(connectionStateField("state", r.TLS))
+	})
 
 	chain := alice.New(
 		ResponseHeaders{Header: o.Header}.Then,
@@ -73,10 +76,7 @@ func NewServerChain(o Options, l *zap.Logger, fbs ...sallusthttp.FieldBuilder) a
 			func(next http.Handler) http.Handler {
 				return http.HandlerFunc(func(response http.ResponseWriter, request *http.Request) {
 					requestLogger := bs.Build(request, l)
-					requestLogger.Info(
-						"tls info",
-						connectionStateField("state", request.TLS),
-					)
+					requestLogger.Info("request received")
 
 					next.ServeHTTP(
 						response,