Cleanup usage of TimestampUnixNanos and its API

Updates #2488 Important Changes: * Rename pdata.TimestampUnixNanos to pdata.Timestamp * Remove pdata.TimestampUnixNanos and helpers, move them of the pdata.Timestamp type. * Fix bug around IsZero, this function should return true if the time is January 1, year 1, 00:00:00 UTC not epoch. Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Feb 25, 2021 · e9a4c2a · e9a4c2a
1 parent 7d7ae2e
commit e9a4c2a
Show file tree

Hide file tree

Showing 70 changed files with 336 additions and 374 deletions.
diff --git a/cmd/pdatagen/internal/base_fields.go b/cmd/pdatagen/internal/base_fields.go
@@ -240,7 +240,7 @@ func (pf *primitiveField) generateCopyToValue(sb *strings.Builder) {
 
 var _ baseField = (*primitiveField)(nil)
 
-// Types that has defined a custom type (e.g. "type TimestampUnixNano uint64")
+// Types that has defined a custom type (e.g. "type Timestamp uint64")
 type primitiveTypedField struct {
 	fieldName       string
 	originFieldName string

diff --git a/cmd/pdatagen/internal/common_structs.go b/cmd/pdatagen/internal/common_structs.go
@@ -75,28 +75,28 @@ var instrumentationLibraryField = &messageValueField{
 var startTimeField = &primitiveTypedField{
 	fieldName:       "StartTime",
 	originFieldName: "StartTimeUnixNano",
-	returnType:      "TimestampUnixNano",
+	returnType:      "Timestamp",
 	rawType:         "uint64",
-	defaultVal:      "TimestampUnixNano(0)",
-	testVal:         "TimestampUnixNano(1234567890)",
+	defaultVal:      "Timestamp(0)",
+	testVal:         "Timestamp(1234567890)",
 }
 
 var timeField = &primitiveTypedField{
 	fieldName:       "Timestamp",
 	originFieldName: "TimeUnixNano",
-	returnType:      "TimestampUnixNano",
+	returnType:      "Timestamp",
 	rawType:         "uint64",
-	defaultVal:      "TimestampUnixNano(0)",
-	testVal:         "TimestampUnixNano(1234567890)",
+	defaultVal:      "Timestamp(0)",
+	testVal:         "Timestamp(1234567890)",
 }
 
 var endTimeField = &primitiveTypedField{
 	fieldName:       "EndTime",
 	originFieldName: "EndTimeUnixNano",
-	returnType:      "TimestampUnixNano",
+	returnType:      "Timestamp",
 	rawType:         "uint64",
-	defaultVal:      "TimestampUnixNano(0)",
-	testVal:         "TimestampUnixNano(1234567890)",
+	defaultVal:      "Timestamp(0)",
+	testVal:         "Timestamp(1234567890)",
 }
 
 var attributes = &sliceField{

diff --git a/cmd/pdatagen/internal/log_structs.go b/cmd/pdatagen/internal/log_structs.go
@@ -88,10 +88,10 @@ var logRecord = &messageValueStruct{
 		&primitiveTypedField{
 			fieldName:       "Timestamp",
 			originFieldName: "TimeUnixNano",
-			returnType:      "TimestampUnixNano",
+			returnType:      "Timestamp",
 			rawType:         "uint64",
-			defaultVal:      "TimestampUnixNano(0)",
-			testVal:         "TimestampUnixNano(1234567890)",
+			defaultVal:      "Timestamp(0)",
+			testVal:         "Timestamp(1234567890)",
 		},
 		traceIDField,
 		spanIDField,

diff --git a/consumer/pdata/common.go b/consumer/pdata/common.go
@@ -19,19 +19,10 @@ package pdata
 
 import (
 	"sort"
-	"time"
 
 	otlpcommon "go.opentelemetry.io/collector/internal/data/protogen/common/v1"
 )
 
-// TimestampUnixNano is a time specified as UNIX Epoch time in nanoseconds since
-// 00:00:00 UTC on 1 January 1970.
-type TimestampUnixNano uint64
-
-func (ts TimestampUnixNano) String() string {
-	return time.Unix(0, int64(ts)).String()
-}
-
 // AttributeValueType specifies the type of AttributeValue.
 type AttributeValueType int
 

diff --git a/consumer/pdata/generated_log.go b/consumer/pdata/generated_log.go
diff --git a/consumer/pdata/generated_log_test.go b/consumer/pdata/generated_log_test.go
diff --git a/consumer/pdata/generated_metrics.go b/consumer/pdata/generated_metrics.go