Skip to content

Commit 73ae97d

Browse files
dmathieudmathieu
committed
ensure we pass the ecs.version
1 parent 0d5cabc commit 73ae97d

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

‎exporter/elasticsearchexporter/exporter.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"context"
99
"errors"
1010
"fmt"
11+
"os"
1112
"runtime"
1213
"sync"
1314
"time"
@@ -650,6 +651,7 @@ func (e *elasticsearchExporter) pushProfileRecord(
650651
case otelserializer.StackFrameIndex:
651652
return stackFramesSession.Add(ctx, index, docID, buf, nil, docappender.ActionCreate)
652653
case otelserializer.AllEventsIndex:
654+
fmt.Fprintf(os.Stdout, "========= EVENT\n%#v\n\n", buf.String())
653655
return eventsSession.Add(ctx, index, docID, buf, nil, docappender.ActionCreate)
654656
case otelserializer.ExecutablesIndex:
655657
return executablesSession.Add(ctx, index, docID, buf, nil, docappender.ActionUpdate)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestSerializeProfile(t *testing.T) {
6060
{
6161
"Stacktrace.frame.ids": "YA3K_koRAADyvzjEk_X7kgAAAAAAAABv",
6262
"Stacktrace.frame.types": "AQM",
63-
"ecs.version": "",
63+
"ecs.version": "1.12.0",
6464
},
6565
{
6666
"script": map[string]any{
@@ -79,7 +79,7 @@ func TestSerializeProfile(t *testing.T) {
7979
"@timestamp": json.Number("0"),
8080
"Stacktrace.count": json.Number("1"),
8181
"Stacktrace.id": "02VzuClbpt_P3xxwox83Ng",
82-
"ecs.version": "",
82+
"ecs.version": "1.12.0",
8383
"process.thread.name": "",
8484
},
8585
},

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ func isFrameSymbolized(frame StackFrame) bool {
159159

160160
func stackTraceEvent(traceID string, profile pprofile.Profile, sample pprofile.Sample) StackTraceEvent {
161161
event := StackTraceEvent{
162+
EcsVersion: EcsVersion{V: EcsVersionString},
162163
StackTraceID: traceID,
163164
Count: 1, // TODO: Check whether count can be dropped with nanosecond timestamps
164165
}
@@ -200,9 +201,10 @@ func stackTrace(stackTraceID string, frames []StackFrame, frameTypes []libpf.Fra
200201
encodeFrameTypesTo(buf, frameTypes)
201202

202203
return StackTrace{
203-
DocID: stackTraceID,
204-
FrameIDs: strings.Join(frameIDs, ""),
205-
Types: buf.String(),
204+
EcsVersion: EcsVersion{V: EcsVersionString},
205+
DocID: stackTraceID,
206+
FrameIDs: strings.Join(frameIDs, ""),
207+
Types: buf.String(),
206208
}
207209
}
208210

@@ -254,6 +256,7 @@ func stackFrames(profile pprofile.Profile, sample pprofile.Sample) ([]StackFrame
254256

255257
frames = append([]StackFrame{
256258
{
259+
EcsVersion: EcsVersion{V: EcsVersionString},
257260
DocID: frameID.String(),
258261
FileName: fileNames,
259262
FunctionName: functionNames,

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,9 @@ func TestTransform(t *testing.T) {
191191
wantPayload: []StackPayload{
192192
{
193193
StackTrace: StackTrace{
194-
DocID: wantedTraceID,
195-
FrameIDs: frameID2Base64 + frameIDBase64,
194+
EcsVersion: EcsVersion{V: EcsVersionString},
195+
DocID: wantedTraceID,
196+
FrameIDs: frameID2Base64 + frameIDBase64,
196197
Types: frameTypesToString([]libpf.FrameType{
197198
libpf.NativeFrame,
198199
libpf.NativeFrame,
@@ -219,6 +220,7 @@ func TestTransform(t *testing.T) {
219220
},
220221
{
221222
StackTraceEvent: StackTraceEvent{
223+
EcsVersion: EcsVersion{V: EcsVersionString},
222224
TimeStamp: 42,
223225
StackTraceID: wantedTraceID,
224226
Count: 1,
@@ -301,8 +303,9 @@ func TestStackPayloads(t *testing.T) {
301303
wantPayload: []StackPayload{
302304
{
303305
StackTrace: StackTrace{
304-
DocID: wantedTraceID,
305-
FrameIDs: frameID2Base64 + frameIDBase64,
306+
EcsVersion: EcsVersion{V: EcsVersionString},
307+
DocID: wantedTraceID,
308+
FrameIDs: frameID2Base64 + frameIDBase64,
306309
Types: frameTypesToString([]libpf.FrameType{
307310
libpf.FrameType(3),
308311
libpf.FrameType(3),
@@ -329,6 +332,7 @@ func TestStackPayloads(t *testing.T) {
329332
},
330333
{
331334
StackTraceEvent: StackTraceEvent{
335+
EcsVersion: EcsVersion{V: EcsVersionString},
332336
TimeStamp: 1,
333337
StackTraceID: wantedTraceID,
334338
Count: 1,
@@ -384,8 +388,9 @@ func TestStackPayloads(t *testing.T) {
384388
wantPayload: []StackPayload{
385389
{
386390
StackTrace: StackTrace{
387-
DocID: wantedTraceID,
388-
FrameIDs: frameID2Base64 + frameIDBase64,
391+
EcsVersion: EcsVersion{V: EcsVersionString},
392+
DocID: wantedTraceID,
393+
FrameIDs: frameID2Base64 + frameIDBase64,
389394
Types: frameTypesToString([]libpf.FrameType{
390395
libpf.FrameType(3),
391396
libpf.FrameType(3),
@@ -412,6 +417,7 @@ func TestStackPayloads(t *testing.T) {
412417
},
413418
{
414419
StackTraceEvent: StackTraceEvent{
420+
EcsVersion: EcsVersion{V: EcsVersionString},
415421
TimeStamp: 1,
416422
StackTraceID: wantedTraceID,
417423
Count: 2,
@@ -457,6 +463,7 @@ func TestStackTraceEvent(t *testing.T) {
457463
},
458464

459465
wantEvent: StackTraceEvent{
466+
EcsVersion: EcsVersion{V: EcsVersionString},
460467
StackTraceID: stacktraceIDBase64,
461468
Count: 1,
462469
},
@@ -476,6 +483,7 @@ func TestStackTraceEvent(t *testing.T) {
476483
},
477484

478485
wantEvent: StackTraceEvent{
486+
EcsVersion: EcsVersion{V: EcsVersionString},
479487
TimeStamp: 1704067273,
480488
StackTraceID: stacktraceIDBase64,
481489
Count: 1,
@@ -495,6 +503,7 @@ func TestStackTraceEvent(t *testing.T) {
495503
},
496504

497505
wantEvent: StackTraceEvent{
506+
EcsVersion: EcsVersion{V: EcsVersionString},
498507
StackTraceID: stacktraceIDBase64,
499508
Count: 1,
500509
},
@@ -527,6 +536,7 @@ func TestStackTraceEvent(t *testing.T) {
527536
},
528537

529538
wantEvent: StackTraceEvent{
539+
EcsVersion: EcsVersion{V: EcsVersionString},
530540
PodName: "my_pod",
531541
ContainerName: "my_container",
532542
ThreadName: "my_thread",
@@ -618,7 +628,8 @@ func TestStackTrace(t *testing.T) {
618628
},
619629

620630
wantTrace: StackTrace{
621-
FrameIDs: frameID3Base64 + frameID2Base64 + frameIDBase64,
631+
EcsVersion: EcsVersion{V: EcsVersionString},
632+
FrameIDs: frameID3Base64 + frameID2Base64 + frameIDBase64,
622633
Types: frameTypesToString([]libpf.FrameType{
623634
libpf.KernelFrame,
624635
libpf.DotnetFrame,

0 commit comments

Comments
 (0)