Skip to content

Commit 1709385

Browse files
committed
oteltest: fix logger fields added by pipeline telemetry
These logger fields are added by the OTel collector. - otelcol.component.kind should be lowercase. See open-telemetry/opentelemetry-collector#12865 - otelcol.signal and not signals See the proposal at https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/component-universal-telemetry.md#receivers. While at it, use the newer All iterator function for logs.
1 parent 118e6c9 commit 1709385

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

libbeat/otelbeat/oteltest/oteltest.go

+8-11
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,19 @@ func CheckReceivers(params CheckReceiversParams) {
7979
receiverCore := core.
8080
With([]zapcore.Field{
8181
zap.String("otelcol.component.id", rc.Name),
82-
zap.String("otelcol.component.kind", "Receiver"),
83-
zap.String("otelcol.signals", "logs"),
82+
zap.String("otelcol.component.kind", "receiver"),
83+
zap.String("otelcol.signal", "logs"),
8484
})
8585

8686
receiverSettings.Logger = zap.New(receiverCore)
8787
receiverSettings.ID = component.NewIDWithName(rc.Factory.Type(), rc.Name)
8888

8989
logConsumer, err := consumer.NewLogs(func(ctx context.Context, ld plog.Logs) error {
90-
for i := 0; i < ld.ResourceLogs().Len(); i++ {
91-
rl := ld.ResourceLogs().At(i)
92-
for j := 0; j < rl.ScopeLogs().Len(); j++ {
93-
sl := rl.ScopeLogs().At(j)
94-
for k := 0; k < sl.LogRecords().Len(); k++ {
95-
log := sl.LogRecords().At(k)
90+
for _, rl := range ld.ResourceLogs().All() {
91+
for _, sl := range rl.ScopeLogs().All() {
92+
for _, lr := range sl.LogRecords().All() {
9693
logsMu.Lock()
97-
logs[rc.Name] = append(logs[rc.Name], log.Body().Map().AsRaw())
94+
logs[rc.Name] = append(logs[rc.Name], lr.Body().Map().AsRaw())
9895
logsMu.Unlock()
9996
}
10097
}
@@ -137,8 +134,8 @@ func CheckReceivers(params CheckReceiversParams) {
137134
// Ensure the logger fields from the otel collector are present in the logs.
138135
for _, zl := range zapLogs.All() {
139136
require.Contains(t, zl.ContextMap(), "otelcol.component.id")
140-
require.Equal(t, zl.ContextMap()["otelcol.component.kind"], "Receiver")
141-
require.Equal(t, zl.ContextMap()["otelcol.signals"], "logs")
137+
require.Equal(t, zl.ContextMap()["otelcol.component.kind"], "receiver")
138+
require.Equal(t, zl.ContextMap()["otelcol.signal"], "logs")
142139
break
143140
}
144141

0 commit comments

Comments
 (0)