Skip to content

Commit e64a18f

Browse files
authored
Add missing logger init in New() functions (#16915)
* Add missing logger init in New() functions
1 parent ad2672d commit e64a18f

File tree

6 files changed

+17
-2
lines changed

6 files changed

+17
-2
lines changed

libbeat/publisher/pipeline/output.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ type netClientWorker struct {
4545

4646
func makeClientWorker(observer outputObserver, qu workQueue, client outputs.Client) outputWorker {
4747
if nc, ok := client.(outputs.NetworkClient); ok {
48-
c := &netClientWorker{observer: observer, qu: qu, client: nc}
48+
c := &netClientWorker{
49+
observer: observer,
50+
qu: qu,
51+
client: nc,
52+
logger: logp.NewLogger("publisher_pipeline_output"),
53+
}
4954
go c.run()
5055
return c
5156
}

libbeat/reader/multiline/multiline.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ func New(
126126
maxLines: maxLines,
127127
separator: []byte(separator),
128128
message: reader.Message{},
129+
logger: logp.NewLogger("reader_multiline"),
129130
}
130131
return mlr, nil
131132
}

libbeat/reader/readfile/line.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ func NewLineReader(input io.Reader, config Config) (*LineReader, error) {
6767
decodedNl: terminator,
6868
inBuffer: streambuf.New(nil),
6969
outBuffer: streambuf.New(nil),
70+
logger: logp.NewLogger("reader_line"),
7071
}, nil
7172
}
7273

libbeat/reader/readjson/docker_json.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func New(r reader.Reader, stream string, partial bool, format string, CRIFlags b
6666
partial: partial,
6767
reader: r,
6868
criflags: CRIFlags,
69+
logger: logp.NewLogger("reader_docker_json"),
6970
}
7071

7172
switch strings.ToLower(format) {

libbeat/reader/readjson/json.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ type JSONReader struct {
3939

4040
// NewJSONReader creates a new reader that can decode JSON.
4141
func NewJSONReader(r reader.Reader, cfg *Config) *JSONReader {
42-
return &JSONReader{reader: r, cfg: cfg}
42+
return &JSONReader{
43+
reader: r,
44+
cfg: cfg,
45+
logger: logp.NewLogger("reader_json"),
46+
}
4347
}
4448

4549
// decodeJSON unmarshals the text parameter into a MapStr and

libbeat/reader/readjson/json_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24+
"github.com/elastic/beats/v7/libbeat/logp"
25+
2426
"github.com/stretchr/testify/assert"
2527

2628
"github.com/elastic/beats/v7/libbeat/common"
@@ -185,6 +187,7 @@ func TestDecodeJSON(t *testing.T) {
185187

186188
var p JSONReader
187189
p.cfg = &test.Config
190+
p.logger = logp.NewLogger("json_test")
188191
text, M := p.decode([]byte(test.Text))
189192
assert.Equal(t, test.ExpectedText, string(text))
190193
assert.Equal(t, test.ExpectedMap, M)

0 commit comments

Comments
 (0)