Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit abde97c

Browse files
committedJan 10, 2025·
Do the appeasing
1 parent 468b35b commit abde97c

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed
 

‎processor/loghouseprocessor/processor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func promoteResourceAttrs(l *plog.LogRecord, rlogs *plog.ResourceLogs) {
153153
return
154154
}
155155
merged := MergeRawMaps(rlogs.Resource().Attributes().AsRaw(), attributes.Map().AsRaw())
156-
rlogs.Resource().Attributes().FromRaw(merged)
156+
_ = rlogs.Resource().Attributes().FromRaw(merged)
157157
}
158158

159159
// MergeRawMaps merges n maps with a later map's keys overriding earlier maps. (copied to avoid dep hell)

‎processor/loghouseprocessor/processor_test.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ package loghouseprocessor
66
import (
77
"testing"
88

9-
"go.opentelemetry.io/collector/pdata/pcommon"
10-
119
"github.com/stretchr/testify/assert"
10+
"go.opentelemetry.io/collector/pdata/pcommon"
1211
"go.opentelemetry.io/collector/pdata/plog"
1312
)
1413

@@ -291,7 +290,7 @@ func Test_promoteResourceAttrs(t *testing.T) {
291290
t.Run("single log", func(t *testing.T) {
292291
rl := plog.NewResourceLogs()
293292
l := plog.NewLogRecord()
294-
l.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
293+
_ = l.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
295294

296295
promoteResourceAttrs(&l, &rl)
297296

@@ -303,9 +302,9 @@ func Test_promoteResourceAttrs(t *testing.T) {
303302
t.Run("two logs", func(t *testing.T) {
304303
rl := plog.NewResourceLogs()
305304
l1 := plog.NewLogRecord()
306-
l1.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
305+
_ = l1.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
307306
l2 := plog.NewLogRecord()
308-
l2.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r2": "v2"}})
307+
_ = l2.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r2": "v2"}})
309308

310309
promoteResourceAttrs(&l1, &rl)
311310
promoteResourceAttrs(&l2, &rl)
@@ -322,9 +321,9 @@ func Test_promoteResourceAttrs(t *testing.T) {
322321
t.Run("last wins", func(t *testing.T) {
323322
rl := plog.NewResourceLogs()
324323
l1 := plog.NewLogRecord()
325-
l1.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
324+
_ = l1.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
326325
l2 := plog.NewLogRecord()
327-
l2.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v2"}})
326+
_ = l2.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v2"}})
328327

329328
promoteResourceAttrs(&l1, &rl)
330329
promoteResourceAttrs(&l2, &rl)
@@ -336,9 +335,9 @@ func Test_promoteResourceAttrs(t *testing.T) {
336335

337336
t.Run("overwrite original", func(t *testing.T) {
338337
rl := plog.NewResourceLogs()
339-
rl.Resource().Attributes().FromRaw(map[string]any{"r1": "original"})
338+
_ = rl.Resource().Attributes().FromRaw(map[string]any{"r1": "original"})
340339
l1 := plog.NewLogRecord()
341-
l1.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
340+
_ = l1.Attributes().FromRaw(map[string]any{"resource": map[string]any{"r1": "v1"}})
342341

343342
promoteResourceAttrs(&l1, &rl)
344343

0 commit comments

Comments
 (0)
Please sign in to comment.