properly format timestamps

Author: dmathieu

exporter/elasticsearchexporter/internal/serializer/otelserializer/profile_test.go

@@ -76,7 +76,7 @@ func TestSerializeProfile(t *testing.T) {
 					"upsert":          map[string]any{},
 				},
 				{
-					"@timestamp":          json.Number("0"),
+					"@timestamp":          "1970-01-01T00:00:00Z",
 					"Stacktrace.count":    json.Number("1"),
 					"Stacktrace.id":       "02VzuClbpt_P3xxwox83Ng",
 					"ecs.version":         "1.12.0",

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/model.go

@@ -4,7 +4,6 @@
 package serializeprofiles // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles"
 
 import (
-	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/ebpf-profiler/libpf"
 )
 
@@ -36,8 +35,8 @@ type StackPayload struct {
 // in the schema mapping.
 type StackTraceEvent struct {
 	EcsVersion
-	TimeStamp    pcommon.Timestamp `json:"@timestamp"`
-	StackTraceID string            `json:"Stacktrace.id"` // 128-bit hash in binary form
+	TimeStamp    unixTime64 `json:"@timestamp"`
+	StackTraceID string     `json:"Stacktrace.id"` // 128-bit hash in binary form
 
 	// Event-specific metadata
 	PodName          string `json:"orchestrator.resource.name,omitempty"`

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/transform.go

@@ -112,7 +112,7 @@ func stackPayloads(_ pcommon.Resource, _ pcommon.InstrumentationScope, profile p
 		// Add one event per timestamp and its count value.
 		for j := 0; j < sample.TimestampsUnixNano().Len(); j++ {
 			t := sample.TimestampsUnixNano().At(j)
-			event.TimeStamp = pcommon.Timestamp(t)
+			event.TimeStamp = newUnixTime64(t)
 
 			if j < sample.Value().Len() {
 				event.Count = uint16(sample.Value().At(j))

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/transform_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pprofile"
 	"go.opentelemetry.io/ebpf-profiler/libpf"
 	semconv "go.opentelemetry.io/otel/semconv/v1.22.0"
@@ -221,7 +220,7 @@ func TestTransform(t *testing.T) {
 				{
 					StackTraceEvent: StackTraceEvent{
 						EcsVersion:   EcsVersion{V: EcsVersionString},
-						TimeStamp:    42,
+						TimeStamp:    42000000000,
 						StackTraceID: wantedTraceID,
 						Count:        1,
 					},
@@ -333,7 +332,7 @@ func TestStackPayloads(t *testing.T) {
 				{
 					StackTraceEvent: StackTraceEvent{
 						EcsVersion:   EcsVersion{V: EcsVersionString},
-						TimeStamp:    1,
+						TimeStamp:    1000000000,
 						StackTraceID: wantedTraceID,
 						Count:        1,
 					},
@@ -418,7 +417,7 @@ func TestStackPayloads(t *testing.T) {
 				{
 					StackTraceEvent: StackTraceEvent{
 						EcsVersion:   EcsVersion{V: EcsVersionString},
-						TimeStamp:    1,
+						TimeStamp:    1000000000,
 						StackTraceID: wantedTraceID,
 						Count:        2,
 					},
@@ -470,7 +469,7 @@ func TestStackTraceEvent(t *testing.T) {
 		},
 		{
 			name:      "sets the timestamp",
-			timestamp: 1704067273,
+			timestamp: 1000000000,
 			buildResourceProfiles: func() pprofile.ResourceProfiles {
 				rp := pprofile.NewResourceProfiles()
 				sp := rp.ScopeProfiles().AppendEmpty()
@@ -484,7 +483,7 @@ func TestStackTraceEvent(t *testing.T) {
 
 			wantEvent: StackTraceEvent{
 				EcsVersion:   EcsVersion{V: EcsVersionString},
-				TimeStamp:    1704067273,
+				TimeStamp:    1000000000000000000,
 				StackTraceID: stacktraceIDBase64,
 				Count:        1,
 			},
@@ -551,7 +550,7 @@ func TestStackTraceEvent(t *testing.T) {
 			s := p.Sample().At(0)
 
 			event := stackTraceEvent(stacktraceIDBase64, p, s)
-			event.TimeStamp = pcommon.Timestamp(tt.timestamp)
+			event.TimeStamp = newUnixTime64(tt.timestamp)
 
 			assert.Equal(t, tt.wantEvent, event)
 		})

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/unixtime.go

@@ -0,0 +1,33 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package serializeprofiles // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles"
+
+import (
+	"encoding/json"
+	"fmt"
+	"math"
+	"time"
+)
+
+// unixTime64 represents nanoseconds since epoch.
+type unixTime64 uint64
+
+// newUnixTime64 creates a unixTime64 from either seconds or nanoseconds since the epoch.
+func newUnixTime64(t uint64) unixTime64 {
+	if t <= math.MaxUint32 {
+		return unixTime64(t) * 1e9
+	}
+	return unixTime64(t)
+}
+
+func (t unixTime64) MarshalJSON() ([]byte, error) {
+	// Nanoseconds, ES does not support 'epoch_nanoseconds' so
+	// we have to pass it a value formatted as 'strict_date_optional_time_nanos'.
+	out := []byte(fmt.Sprintf("%q",
+		time.Unix(0, int64(t)).UTC().Format(time.RFC3339Nano)))
+	return out, nil
+}
+
+// Compile-time interface checks
+var _ json.Marshaler = (*unixTime64)(nil)

exporter/elasticsearchexporter/internal/serializer/otelserializer/serializeprofiles/unixtime_test.go

@@ -0,0 +1,43 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package serializeprofiles
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUnixTime64_MarshalJSON(t *testing.T) {
+	tests := []struct {
+		name string
+		time unixTime64
+		want string
+	}{
+		{
+			name: "zero",
+			time: newUnixTime64(0),
+			want: `"1970-01-01T00:00:00Z"`,
+		},
+		{
+			name: "32bit value (assure there is no regression)",
+			time: newUnixTime64(1710349106),
+			want: `"2024-03-13T16:58:26Z"`,
+		},
+		{
+			name: "64bit value",
+			time: newUnixTime64(1710349106864964685),
+			want: `"2024-03-13T16:58:26.864964685Z"`,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			b, err := test.time.MarshalJSON()
+			require.NoError(t, err)
+			assert.Equal(t, test.want, string(b))
+		})
+	}
+}