pull upstream changes

Author: navinms711

packages/gorouter/spec

@@ -35,6 +35,7 @@ files:
   - code.cloudfoundry.org/gorouter/handlers/*.go # gosub
   - code.cloudfoundry.org/gorouter/integration/*.go # gosub
   - code.cloudfoundry.org/gorouter/logger/*.go # gosub
+  - code.cloudfoundry.org/gorouter/logadapter/*.go # gosub
   - code.cloudfoundry.org/gorouter/mbus/*.go # gosub
   - code.cloudfoundry.org/gorouter/mbus/fakes/*.go # gosub
   - code.cloudfoundry.org/gorouter/metrics/*.go # gosub

src/code.cloudfoundry.org/gorouter/cmd/gorouter/main.go

@@ -11,6 +11,7 @@ import (
 	"syscall"
 	"time"
 
+	"code.cloudfoundry.org/gorouter/logadapter"
 	"code.cloudfoundry.org/gorouter/metrics_prometheus"
 
 	"code.cloudfoundry.org/clock"
@@ -100,11 +101,8 @@ func main() {
 		runtime.GOMAXPROCS(c.GoMaxProcs)
 	}
 
-	// start the debugserver
 	if c.DebugAddr != "" {
-		// create a zapLevelSink that uses the logger
-		sink := &zapLevelSink{logger: logger}
-		// create a new debugserver with the address and the sink and run it
+		sink := logadapter.NewZapLevelSink(logger)
 		_, err = debugserver.Run(c.DebugAddr, sink)
 		if err != nil {
 			logger.Error("failed-to-start-debug-server", grlog.ErrAttr(err))

src/code.cloudfoundry.org/gorouter/integration/test_utils_test.go

@@ -2,7 +2,6 @@ package integration
 
 import (
 	"crypto/tls"
-	// "io"
 	"os"
 	"os/exec"
 	"syscall"

src/code.cloudfoundry.org/gorouter/cmd/gorouter/adapter.go renamed to src/code.cloudfoundry.org/gorouter/logadapter/logadapter.go

@@ -1,4 +1,4 @@
-package main
+package logadapter
 
 import (
 	grlog "code.cloudfoundry.org/gorouter/logger"
@@ -8,7 +8,6 @@ import (
 	"log/slog"
 	"os"
 	"strings"
-	"time"
 )
 
 // zapLevelSink is a lager sink that uses a slog.Logger for logging.
@@ -20,6 +19,10 @@ type zapLevelSink struct {
 	logger *slog.Logger
 }
 
+func NewZapLevelSink(l *slog.Logger) *zapLevelSink {
+	return &zapLevelSink{logger: l}
+}
+
 func (z *zapLevelSink) Log(lf lager.LogFormat) {
 	z.logger.Info("zapLevelSink Log()", slog.String("Zap Level Sink log invoked", lf.Message),
 		slog.String("source", lf.Source))
@@ -88,10 +91,8 @@ func NewZapLoggerWithTimestamp() *zap.Logger {
 	cfg.TimeKey = "timestamp"
 	cfg.LevelKey = "log_level"
 	cfg.MessageKey = "message"
-	// time encoded as float64
-	cfg.EncodeTime = func(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
-		enc.AppendFloat64(float64(t.UnixNano()) / 1e9)
-	}
+	// time encoded in RFC3339 format
+	cfg.EncodeTime = zapcore.RFC3339TimeEncoder
 	// Encode log level as int. zapcore.Level is 0-indexed,
 	// so add 1 to the level to match the gorouter's expected level.
 	cfg.EncodeLevel = func(l zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {