eventpb: make the Timestamp field an int64

pkg/server/node.go

@@ -797,7 +797,7 @@ func (n *Node) recordJoinEvent(ctx context.Context) {
 		nodeDetails = &ev.CommonNodeEventDetails
 		nodeDetails.LastUp = n.startedAt
 	}
-	event.CommonDetails().Timestamp = timeutil.Now()
+	event.CommonDetails().Timestamp = timeutil.Now().UnixNano()
 	nodeDetails.StartedAt = n.startedAt
 	nodeDetails.NodeID = int32(n.Descriptor.NodeID)
 

pkg/server/server.go

@@ -2032,7 +2032,7 @@ func (s *Server) Decommission(
 	} else {
 		panic("unexpected target membership status")
 	}
-	event.CommonDetails().Timestamp = timeutil.Now()
+	event.CommonDetails().Timestamp = timeutil.Now().UnixNano()
 	nodeDetails.RequestingNodeID = int32(s.NodeID())
 
 	for _, nodeID := range nodeIDs {

pkg/sql/event_log.go

@@ -13,7 +13,6 @@ package sql
 import (
 	"context"
 	"encoding/json"
-	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/kv"
@@ -23,6 +22,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/log/eventpb"
+	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
 )
 
@@ -49,7 +49,7 @@ func logEventInternalForSchemaChanges(
 	mutationID descpb.MutationID,
 	event eventpb.EventPayload,
 ) error {
-	event.CommonDetails().Timestamp = txn.ReadTimestamp().GoTime()
+	event.CommonDetails().Timestamp = txn.ReadTimestamp().WallTime
 	scCommon, ok := event.(eventpb.EventWithCommonSchemaChangePayload)
 	if !ok {
 		return errors.AssertionFailedf("unknown event type: %T", event)
@@ -84,7 +84,7 @@ func logEventInternalForSQLStatements(
 	event eventpb.EventPayload,
 ) error {
 	// Inject the common fields into the payload provided by the caller.
-	event.CommonDetails().Timestamp = txn.ReadTimestamp().GoTime()
+	event.CommonDetails().Timestamp = txn.ReadTimestamp().WallTime
 	sqlCommon, ok := event.(eventpb.EventWithCommonSQLPayload)
 	if !ok {
 		return errors.AssertionFailedf("unknown event type: %T", event)
@@ -135,8 +135,7 @@ func InsertEventRecord(
 	info.CommonDetails().EventType = eventType
 
 	// The caller is responsible for the timestamp field.
-	var zeroTime time.Time
-	if info.CommonDetails().Timestamp == zeroTime {
+	if info.CommonDetails().Timestamp == 0 {
 		return errors.AssertionFailedf("programming error: timestamp field in event not populated: %T", info)
 	}
 
@@ -160,7 +159,7 @@ VALUES(
 )
 `
 	args := []interface{}{
-		info.CommonDetails().Timestamp,
+		timeutil.Unix(0, info.CommonDetails().Timestamp),
 		eventType,
 		targetID,
 		reportingID,

pkg/testutils/lint/lint_test.go

@@ -1931,11 +1931,9 @@ func TestLint(t *testing.T) {
 		filters := []stream.Filter{
 			// Ignore generated files.
 			stream.GrepNot(`pkg/.*\.pb\.go:`),
-			stream.GrepNot(`pkg/col/coldata/.*\.eg\.go:`),
-			stream.GrepNot(`pkg/col/colserde/arrowserde/.*_generated\.go:`),
-			stream.GrepNot(`pkg/sql/colexec/.*\.eg\.go:`),
-			stream.GrepNot(`pkg/sql/colexec/.*_generated\.go:`),
-			stream.GrepNot(`pkg/sql/pgwire/hba/conf.go:`),
+			stream.GrepNot(`pkg/.*\.pb\.gw\.go:`),
+			stream.GrepNot(`pkg/.*\.[eo]g\.go:`),
+			stream.GrepNot(`pkg/.*_generated\.go:`),
 
 			// Ignore types that can change by system.
 			stream.GrepNot(`pkg/util/sysutil/sysutil_unix.go:`),
@@ -1945,19 +1943,10 @@ func TestLint(t *testing.T) {
 			stream.GrepNot(`include/jemalloc/jemalloc\.h`),
 
 			stream.GrepNot(`declaration of "?(pE|e)rr"? shadows`),
-			stream.GrepNot(`\.pb\.gw\.go:[0-9:]+: declaration of "?ctx"? shadows`),
-			stream.GrepNot(`\.[eo]g\.go:[0-9:]+: declaration of ".*" shadows`),
 			// This exception is for hash.go, which re-implements runtime.noescape
 			// for efficient hashing.
 			stream.GrepNot(`pkg/sql/colexec/hash.go:[0-9:]+: possible misuse of unsafe.Pointer`),
 			stream.GrepNot(`^#`), // comment line
-			// This exception is for the colexec generated files.
-			stream.GrepNot(`pkg/sql/colexec/.*\.eg.go:[0-9:]+: self-assignment of .* to .*`),
-			// Roachpb generated switch on `error`. It's OK for now because
-			// the inner error is always unwrapped (it's a protobuf
-			// enum). Eventually we want to use generalized error
-			// encode/decode instead and drop the linter exception.
-			stream.GrepNot(`pkg/roachpb/batch_generated\.go:.*invalid direct cast on error object`),
 			// Roachpb's own error package takes ownership of error unwraps
 			// (by enforcing that errors can never been wrapped under a
 			// roachpb.Error, which is an inconvenient limitation but it is

pkg/util/log/event_log.go

@@ -13,7 +13,6 @@ package log
 import (
 	"context"
 	"encoding/json"
-	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/util/log/eventpb"
 	"github.com/cockroachdb/cockroach/pkg/util/log/severity"
@@ -24,9 +23,8 @@ import (
 func StructuredEvent(ctx context.Context, event eventpb.EventPayload) {
 	// Populate the missing common fields.
 	common := event.CommonDetails()
-	var zeroTime time.Time
-	if common.Timestamp == zeroTime {
-		common.Timestamp = timeutil.Now()
+	if common.Timestamp == 0 {
+		common.Timestamp = timeutil.Now().UnixNano()
 	}
 	if len(common.EventType) == 0 {
 		common.EventType = eventpb.GetEventTypeName(event)

pkg/util/log/eventpb/BUILD.bazel

@@ -19,6 +19,5 @@ go_library(
     deps = [
         "//pkg/util/log/logpb",
         "//vendor/github.com/gogo/protobuf/proto",
-        "//vendor/github.com/gogo/protobuf/types",
     ],
 )

pkg/util/log/eventpb/events.proto

@@ -24,8 +24,9 @@ import "google/protobuf/timestamp.proto";
 
 // CommonEventDetails contains the fields common to all events.
 message CommonEventDetails {
-  // The timestamp of the event.
-  google.protobuf.Timestamp timestamp = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.jsontag) = ",omitempty"];
+  // The timestamp of the event. Expressed as nanoseconds since
+  // the Unix epoch.
+  int64 timestamp = 1 [(gogoproto.jsontag) = ",omitempty"];
   // The type of the event.
   string event_type = 2 [(gogoproto.jsontag) = ",omitempty"];
 }