From a0150fa5dc236479bde544eb4e55076243152a8b Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <abg@uber.com>
Date: Thu, 7 Jan 2021 15:31:36 -0800
Subject: [PATCH] error output: Use entry time stamps

For error cases, use the timestamp attached to the corresponding entry
rather than the current time.
---
 logger.go        | 3 +--
 zapcore/entry.go | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/logger.go b/logger.go
index 9852da1d8..c4b562640 100644
--- a/logger.go
+++ b/logger.go
@@ -26,7 +26,6 @@ import (
 	"os"
 	"runtime"
 	"strings"
-	"time"
 
 	"go.uber.org/zap/zapcore"
 )
@@ -310,7 +309,7 @@ func (log *Logger) check(lvl zapcore.Level, msg string) *zapcore.CheckedEntry {
 	if log.addCaller {
 		frame, defined := getCallerFrame(log.callerSkip + callerSkipOffset)
 		if !defined {
-			fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", time.Now().UTC())
+			fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC())
 			log.errorOutput.Sync()
 		}
 
diff --git a/zapcore/entry.go b/zapcore/entry.go
index 4aa8b4f90..2d815feb8 100644
--- a/zapcore/entry.go
+++ b/zapcore/entry.go
@@ -208,7 +208,7 @@ func (ce *CheckedEntry) Write(fields ...Field) {
 			// If the entry is dirty, log an internal error; because the
 			// CheckedEntry is being used after it was returned to the pool,
 			// the message may be an amalgamation from multiple call sites.
-			fmt.Fprintf(ce.ErrorOutput, "%v Unsafe CheckedEntry re-use near Entry %+v.\n", time.Now(), ce.Entry)
+			fmt.Fprintf(ce.ErrorOutput, "%v Unsafe CheckedEntry re-use near Entry %+v.\n", ce.Time, ce.Entry)
 			ce.ErrorOutput.Sync()
 		}
 		return
@@ -221,7 +221,7 @@ func (ce *CheckedEntry) Write(fields ...Field) {
 	}
 	if ce.ErrorOutput != nil {
 		if err != nil {
-			fmt.Fprintf(ce.ErrorOutput, "%v write error: %v\n", time.Now(), err)
+			fmt.Fprintf(ce.ErrorOutput, "%v write error: %v\n", ce.Time, err)
 			ce.ErrorOutput.Sync()
 		}
 	}