4 files changed, 14 insertions, 7 deletions
diff --git a/src/mongo/logger/log_test.cpp b/src/mongo/logger/log_test.cpp
index 4d616a1a42b..ca60eb28040 100644
--- a/src/mongo/logger/log_test.cpp
+++ b/src/mongo/logger/log_test.cpp
@@ -89,17 +89,17 @@ namespace {
         MessageLogDomain domain;
 
         // Appending to the domain before attaching the appender does not affect the appender.
-        domain.append(MessageEventEphemeral(0ULL, LogSeverity::Log(), "", "1"));
+        domain.append(MessageEventEphemeral(Date_t(), LogSeverity::Log(), "", "1"));
         ASSERT_EQUALS(0, dynamic_cast<CountAppender*>(countAppender.get())->getCount());
 
         // Appending to the domain after attaching the appender does affect the appender.
         MessageLogDomain::AppenderHandle handle = domain.attachAppender(countAppender);
-        domain.append(MessageEventEphemeral(0ULL, LogSeverity::Log(), "", "2"));
+        domain.append(MessageEventEphemeral(Date_t(), LogSeverity::Log(), "", "2"));
         countAppender = domain.detachAppender(handle);
         ASSERT_EQUALS(1, dynamic_cast<CountAppender*>(countAppender.get())->getCount());
 
         // Appending to the domain after detaching the appender does not affect the appender.
-        domain.append(MessageEventEphemeral(0ULL, LogSeverity::Log(), "", "3"));
+        domain.append(MessageEventEphemeral(Date_t(), LogSeverity::Log(), "", "3"));
         ASSERT_EQUALS(1, dynamic_cast<CountAppender*>(countAppender.get())->getCount());
     }
 
@@ -383,7 +383,7 @@ namespace {
 
     // Log severity should always be logged as a single capital letter.
     TEST_F(LogTestUnadornedEncoder, MessageEventDetailsEncoderLogSeverity) {
-        Date_t d(curTimeMillis64());
+        Date_t d = Date_t::now();
         StringData ctx("WHAT", StringData::LiteralTag());
         StringData msg("HUH", StringData::LiteralTag());
         // Severe is indicated by (F)atal.
@@ -406,7 +406,7 @@ namespace {
 
     // Non-default log component short name should always be logged.
     TEST_F(LogTestUnadornedEncoder, MessageEventDetailsEncoderLogComponent) {
-        Date_t d(curTimeMillis64());
+        Date_t d = Date_t::now();
         StringData ctx("WHAT", StringData::LiteralTag());
         StringData msg("HUH", StringData::LiteralTag());
         for (int i = 0; i < int(LogComponent::kNumLogComponents); ++i) {
diff --git a/src/mongo/logger/logstream_builder.cpp b/src/mongo/logger/logstream_builder.cpp
index 1ed0e701c45..1adef55dd6d 100644
--- a/src/mongo/logger/logstream_builder.cpp
+++ b/src/mongo/logger/logstream_builder.cpp
@@ -127,7 +127,7 @@ namespace logger {
         if (_os) {
             if ( !_baseMessage.empty() ) _baseMessage.push_back(' ');
             _baseMessage += _os->str();
-            MessageEventEphemeral message(curTimeMillis64(), _severity, _component, _contextName,
+            MessageEventEphemeral message(Date_t::now(), _severity, _component, _contextName,
                                           _baseMessage);
             _domain->append(message);
             if (_tee) {
diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h
index 7c923d6ece3..638534484ee 100644
--- a/src/mongo/logger/logstream_builder.h
+++ b/src/mongo/logger/logstream_builder.h
@@ -35,6 +35,7 @@
 #include "mongo/logger/log_component.h"
 #include "mongo/logger/log_severity.h"
 #include "mongo/logger/message_log_domain.h"
+#include "mongo/stdx/chrono.h"
 #include "mongo/util/exit_code.h"
 
 namespace mongo {
@@ -130,6 +131,12 @@ namespace logger {
         LogstreamBuilder& operator<<(unsigned long long x) { stream() << x; return *this; }
         LogstreamBuilder& operator<<(bool x) { stream() << x; return *this; }
 
+        template <typename Rep, typename Period>
+        LogstreamBuilder& operator<<(stdx::chrono::duration<Rep, Period> d) {
+            stream() << d;
+            return *this;
+        }
+
         template <typename T>
         LogstreamBuilder& operator<<(const T& x) {
             stream() << x.toString();
diff --git a/src/mongo/logger/message_event.h b/src/mongo/logger/message_event.h
index b38e792dcd1..516af0f3f84 100644
--- a/src/mongo/logger/message_event.h
+++ b/src/mongo/logger/message_event.h
@@ -67,7 +67,7 @@ namespace logger {
             _contextName(contextName),
             _message(message) {}
 
-        uint64_t getDate() const { return _date; }
+        Date_t getDate() const { return _date; }
         LogSeverity getSeverity() const { return _severity; }
         LogComponent getComponent() const { return _component; }
         StringData getContextName() const { return _contextName; }