diff --git a/x-pack/filebeat/input/netflow/decoder/config/config.go b/x-pack/filebeat/input/netflow/decoder/config/config.go
index befaa4165f3e..8b51336596ea 100644
--- a/x-pack/filebeat/input/netflow/decoder/config/config.go
+++ b/x-pack/filebeat/input/netflow/decoder/config/config.go
@@ -30,8 +30,11 @@ type Config struct {
 
 // Defaults returns a configuration object with defaults settings:
 // - no protocols are enabled.
-// - log output is discarded
+// - log output is set to the logger that is passed in.
 // - session expiration is checked once every hour.
+// - resets are detected.
+// - templates are not shared.
+// - cache is disabled.
 func Defaults(logger *logp.Logger) Config {
 	return Config{
 		protocols:       []string{},
@@ -50,12 +53,6 @@ func (c *Config) WithProtocols(protos ...string) *Config {
 	return c
 }
 
-// WithLogOutput sets the output io.Writer for logging.
-func (c *Config) WithLogOutput(output *logp.Logger) *Config {
-	c.logOutput = output
-	return c
-}
-
 // WithExpiration configures the expiration timeout for sessions and templates.
 // A value of zero disables expiration.
 func (c *Config) WithExpiration(timeout time.Duration) *Config {
diff --git a/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go b/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go
index 59d1ee8f0b04..2d88eb0bebfc 100644
--- a/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go
+++ b/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go
@@ -18,8 +18,7 @@ import (
 func main() {
 	logger := logp.L().Named("netflow")
 
-	decoder, err := decoder.NewDecoder(decoder.NewConfig().
-		WithLogOutput(logger).
+	decoder, err := decoder.NewDecoder(decoder.NewConfig(logger).
 		WithProtocols("v1", "v5", "v9", "ipfix"))
 	if err != nil {
 		logger.Fatal("Failed creating decoder:", err)
diff --git a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go
index afed80638c1e..d4b0445d419b 100644
--- a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go
@@ -12,6 +12,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
@@ -19,6 +21,10 @@ import (
 	v9 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v9"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 func TestMessageWithOptions(t *testing.T) {
 	rawString := "" +
 		"000a01e45bf435e1000000a500000000000200480400001000080004000c0004" +
@@ -67,7 +73,7 @@ func TestMessageWithOptions(t *testing.T) {
 			"version":      uint64(10),
 		},
 	}
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 	flows, err := proto.OnPacket(bytes.NewBuffer(raw), test.MakeAddress(t, "127.0.0.1:1234"))
 	assert.NoError(t, err)
 	if assert.Len(t, flows, 7) {
@@ -84,7 +90,7 @@ func TestOptionTemplates(t *testing.T) {
 	key := v9.MakeSessionKey(addr, 1234, false)
 
 	t.Run("Single options template", func(t *testing.T) {
-		proto := New(config.Defaults())
+		proto := New(config.Defaults(logp.L()))
 		flows, err := proto.OnPacket(test.MakePacket([]uint16{
 			// Header
 			// Version, Length, Ts, SeqNo, Source
@@ -113,7 +119,7 @@ func TestOptionTemplates(t *testing.T) {
 	})
 
 	t.Run("Multiple options template", func(t *testing.T) {
-		proto := New(config.Defaults())
+		proto := New(config.Defaults(logp.L()))
 		raw := test.MakePacket([]uint16{
 			// Header
 			// Version, Count, Ts, SeqNo, Source
@@ -151,7 +157,7 @@ func TestOptionTemplates(t *testing.T) {
 	})
 
 	t.Run("records discarded", func(t *testing.T) {
-		proto := New(config.Defaults())
+		proto := New(config.Defaults(logp.L()))
 		raw := test.MakePacket([]uint16{
 			// Header
 			// Version, Count, Ts, SeqNo, Source
@@ -193,7 +199,7 @@ func TestOptionTemplates(t *testing.T) {
 func TestCustomFields(t *testing.T) {
 	addr := test.MakeAddress(t, "127.0.0.1:12345")
 
-	conf := config.Defaults()
+	conf := config.Defaults(logp.L())
 	conf.WithCustomFields(fields.FieldDict{
 		fields.Key{EnterpriseID: 0x12345678, FieldID: 33}: &fields.Field{Name: "customField", Decoder: fields.String},
 	})
diff --git a/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go b/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go
index b78fe875486f..8b2eb75f63c6 100644
--- a/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go
@@ -11,10 +11,16 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 type testProto int
 
 func (testProto) Version() uint16 {
@@ -61,7 +67,7 @@ func TestRegistry_Get(t *testing.T) {
 		assert.NoError(t, err)
 		gen, err := registry.Get("my_proto")
 		assert.NoError(t, err)
-		assert.Equal(t, testProto(0), gen(config.Defaults()))
+		assert.Equal(t, testProto(0), gen(config.Defaults(logp.L())))
 	})
 	t.Run("two protocols", func(t *testing.T) {
 		registry := ProtocolRegistry{}
@@ -71,10 +77,10 @@ func TestRegistry_Get(t *testing.T) {
 		assert.NoError(t, err)
 		gen, err := registry.Get("my_proto")
 		assert.NoError(t, err)
-		assert.Equal(t, testProto(1), gen(config.Defaults()))
+		assert.Equal(t, testProto(1), gen(config.Defaults(logp.L())))
 		gen, err = registry.Get("other_proto")
 		assert.NoError(t, err)
-		assert.Equal(t, testProto(2), gen(config.Defaults()))
+		assert.Equal(t, testProto(2), gen(config.Defaults(logp.L())))
 	})
 	t.Run("not registered", func(t *testing.T) {
 		registry := ProtocolRegistry{}
diff --git a/x-pack/filebeat/input/netflow/decoder/v1/v1.go b/x-pack/filebeat/input/netflow/decoder/v1/v1.go
index 5442cf0a5d87..e7ccc6659ba3 100644
--- a/x-pack/filebeat/input/netflow/decoder/v1/v1.go
+++ b/x-pack/filebeat/input/netflow/decoder/v1/v1.go
@@ -59,11 +59,13 @@ type NetflowProtocol struct {
 }
 
 func init() {
-	_ := protocol.Registry.Register(ProtocolName, New)
+	if err := protocol.Registry.Register(ProtocolName, New); err != nil {
+		panic(err)
+	}
 }
 
 func New(config config.Config) protocol.Protocol {
-	return NewProtocol(ProtocolID, &templateV1, readV1Header, logp.L().Named(LogPrefix))
+	return NewProtocol(ProtocolID, &templateV1, readV1Header, config.LogOutput().Named(LogPrefix))
 }
 
 func NewProtocol(version uint16, template *template.Template, readHeader ReadHeaderFn, logger *logp.Logger) protocol.Protocol {
diff --git a/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go b/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go
index 8887298c06d0..e88a168fbf56 100644
--- a/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go
@@ -17,10 +17,15 @@ import (
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
 	template2 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test"
+	"github.com/elastic/elastic-agent-libs/logp"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 func TestNetflowProtocol_New(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	assert.Nil(t, proto.Start())
 	assert.Equal(t, uint16(1), proto.Version())
@@ -28,7 +33,7 @@ func TestNetflowProtocol_New(t *testing.T) {
 }
 
 func TestNetflowProtocol_OnPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00010002000000015bf689f605946fb0" +
 		"acd910e5c0a8017b00000000000000000000000e00002cfa" +
@@ -105,7 +110,7 @@ func TestNetflowProtocol_OnPacket(t *testing.T) {
 }
 
 func TestNetflowProtocol_BadPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00010002000000015bf689f605"
 	raw, err := hex.DecodeString(rawS)
diff --git a/x-pack/filebeat/input/netflow/decoder/v5/v5.go b/x-pack/filebeat/input/netflow/decoder/v5/v5.go
index f8bb55e83ad7..d96091c8ca97 100644
--- a/x-pack/filebeat/input/netflow/decoder/v5/v5.go
+++ b/x-pack/filebeat/input/netflow/decoder/v5/v5.go
@@ -53,7 +53,9 @@ var templateV5 = template.Template{
 }
 
 func init() {
-	_ := protocol.Registry.Register(ProtocolName, New)
+	if err := protocol.Registry.Register(ProtocolName, New); err != nil {
+		panic(err)
+	}
 }
 
 func New(config config.Config) protocol.Protocol {
diff --git a/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go b/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go
index 9494d482f6d3..821e6248e953 100644
--- a/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go
@@ -13,14 +13,20 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 func TestNetflowProtocol_New(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	assert.Nil(t, proto.Start())
 	assert.Equal(t, uint16(5), proto.Version())
@@ -28,7 +34,7 @@ func TestNetflowProtocol_New(t *testing.T) {
 }
 
 func TestNetflowProtocol_OnPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00050002000000015bf68d8b35fcb9780000000000000000" +
 		"acd910e5c0a8017b00000000000000000000000e00002cfa" +
@@ -119,7 +125,7 @@ func TestNetflowProtocol_OnPacket(t *testing.T) {
 }
 
 func TestNetflowProtocol_BadPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00050002000000015bf689f605"
 	raw, err := hex.DecodeString(rawS)
diff --git a/x-pack/filebeat/input/netflow/decoder/v6/v6.go b/x-pack/filebeat/input/netflow/decoder/v6/v6.go
index f5c46e2d5e0c..5949af7960be 100644
--- a/x-pack/filebeat/input/netflow/decoder/v6/v6.go
+++ b/x-pack/filebeat/input/netflow/decoder/v6/v6.go
@@ -47,7 +47,9 @@ var templateV6 = template.Template{
 }
 
 func init() {
-	_ := protocol.Registry.Register(ProtocolName, New)
+	if err := protocol.Registry.Register(ProtocolName, New); err != nil {
+		panic(err)
+	}
 }
 
 func New(config config.Config) protocol.Protocol {
diff --git a/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go b/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go
index af46896289e2..5703fe523434 100644
--- a/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go
@@ -13,14 +13,20 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 func TestNetflowProtocol_New(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	assert.Nil(t, proto.Start())
 	assert.Equal(t, uint16(6), proto.Version())
@@ -28,7 +34,7 @@ func TestNetflowProtocol_New(t *testing.T) {
 }
 
 func TestNetflowProtocol_OnPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00060002000000015bf68d8b35fcb9780000000000000000" +
 		"acd910e5c0a8017b00000000000000000000000e00002cfa" +
@@ -121,7 +127,7 @@ func TestNetflowProtocol_OnPacket(t *testing.T) {
 }
 
 func TestNetflowProtocol_BadPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00060002000000015bf689f605"
 	raw, err := hex.DecodeString(rawS)
diff --git a/x-pack/filebeat/input/netflow/decoder/v7/v7.go b/x-pack/filebeat/input/netflow/decoder/v7/v7.go
index dc6c9cdbee41..d851d9420784 100644
--- a/x-pack/filebeat/input/netflow/decoder/v7/v7.go
+++ b/x-pack/filebeat/input/netflow/decoder/v7/v7.go
@@ -54,7 +54,9 @@ var v7template = template.Template{
 }
 
 func init() {
-	_ := protocol.Registry.Register(ProtocolName, New)
+	if err := protocol.Registry.Register(ProtocolName, New); err != nil {
+		panic(err)
+	}
 }
 
 func New(config config.Config) protocol.Protocol {
diff --git a/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go b/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go
index cafdbc36b563..66481394dbc5 100644
--- a/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go
@@ -13,6 +13,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template"
@@ -20,7 +22,7 @@ import (
 )
 
 func TestNetflowProtocol_New(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	assert.Nil(t, proto.Start())
 	assert.Equal(t, uint16(7), proto.Version())
@@ -28,7 +30,7 @@ func TestNetflowProtocol_New(t *testing.T) {
 }
 
 func TestNetflowProtocol_OnPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00070002000000015bf68d8b35fcb9780000000000000000" +
 		"acd910e5c0a8017b00000000000000000000000e00002cfa" +
@@ -119,7 +121,7 @@ func TestNetflowProtocol_OnPacket(t *testing.T) {
 }
 
 func TestNetflowProtocol_BadPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00060002000000015bf689f605"
 	raw, err := hex.DecodeString(rawS)
diff --git a/x-pack/filebeat/input/netflow/decoder/v8/v8.go b/x-pack/filebeat/input/netflow/decoder/v8/v8.go
index 1ec192b3d06d..06b3ac6c292c 100644
--- a/x-pack/filebeat/input/netflow/decoder/v8/v8.go
+++ b/x-pack/filebeat/input/netflow/decoder/v8/v8.go
@@ -304,12 +304,14 @@ type NetflowV8Protocol struct {
 }
 
 func init() {
-	_ := protocol.Registry.Register(ProtocolName, New)
+	if err := protocol.Registry.Register(ProtocolName, New); err != nil {
+		panic(err)
+	}
 }
 
 func New(config config.Config) protocol.Protocol {
 	return &NetflowV8Protocol{
-		logger: logp.L().Named(LogPrefix),
+		logger: config.LogOutput().Named(LogPrefix),
 	}
 }
 
diff --git a/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go b/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go
index 81ad2437cae9..0624b76db47d 100644
--- a/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go
@@ -14,12 +14,18 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record"
 	template2 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template"
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 func TestTemplates(t *testing.T) {
 	for code, template := range templates {
 		if !template2.ValidateTemplate(t, template) {
@@ -29,7 +35,7 @@ func TestTemplates(t *testing.T) {
 }
 
 func TestNetflowProtocol_New(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	assert.Nil(t, proto.Start())
 	assert.Equal(t, uint16(8), proto.Version())
@@ -37,7 +43,7 @@ func TestNetflowProtocol_New(t *testing.T) {
 }
 
 func TestNetflowProtocol_BadPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	rawS := "00080002000000015bf689f605"
 	raw, err := hex.DecodeString(rawS)
@@ -50,7 +56,7 @@ func TestNetflowProtocol_BadPacket(t *testing.T) {
 }
 
 func TestNetflowV8Protocol_OnPacket(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 	address := test.MakeAddress(t, "127.0.0.1:11111")
 	captureTime, err := time.Parse(time.RFC3339Nano, "2018-11-22T20:53:03.987654321Z")
 	if !assert.NoError(t, err) {
diff --git a/x-pack/filebeat/input/netflow/decoder/v9/session_test.go b/x-pack/filebeat/input/netflow/decoder/v9/session_test.go
index c83d80384e1b..88d38284be8d 100644
--- a/x-pack/filebeat/input/netflow/decoder/v9/session_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v9/session_test.go
@@ -18,15 +18,16 @@ import (
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test"
 )
 
-var logerr = logp.DevelopmentSetup(logp.ToDiscardOutput())
-var glogger = logp.NewLogger("")
+func init() {
+	logp.TestingSetup()
+}
 
 func makeSessionKey(t testing.TB, ipPortPair string, domain uint32) SessionKey {
 	return MakeSessionKey(test.MakeAddress(t, ipPortPair), domain, false)
 }
 
 func TestSessionMap_GetOrCreate(t *testing.T) {
-	var logger = glogger.Named("session_map")
+	var logger = logp.NewLogger("session_map")
 	t.Run("consistent behavior", func(t *testing.T) {
 		sm := NewSessionMap(logger, nil)
 
@@ -103,7 +104,7 @@ func testTemplate(id uint16) *template.Template {
 }
 
 func TestSessionState(t *testing.T) {
-	var logger = glogger.Named("session_state")
+	var logger = logp.NewLogger("session_state")
 	t.Run("create and get", func(t *testing.T) {
 		s := NewSession(logger)
 		t1 := testTemplate(1)
@@ -135,7 +136,7 @@ func TestSessionState(t *testing.T) {
 }
 
 func TestSessionMap_Cleanup(t *testing.T) {
-	sm := NewSessionMap(glogger, nil)
+	sm := NewSessionMap(logp.L(), nil)
 
 	// Session is created
 	k1 := makeSessionKey(t, "127.0.0.1:1234", 1)
@@ -182,7 +183,7 @@ func TestSessionMap_Cleanup(t *testing.T) {
 
 func TestSessionMap_CleanupLoop(t *testing.T) {
 	timeout := time.Millisecond * 100
-	sm := NewSessionMap(glogger.Named(""), nil)
+	sm := NewSessionMap(logp.NewLogger(""), nil)
 	key := makeSessionKey(t, "127.0.0.1:1", 42)
 	s := sm.GetOrCreate(key)
 
@@ -203,7 +204,7 @@ func TestSessionMap_CleanupLoop(t *testing.T) {
 }
 
 func TestTemplateExpiration(t *testing.T) {
-	s := NewSession(glogger)
+	s := NewSession(logp.L())
 	assert.Nil(t, s.GetTemplate(256))
 	assert.Nil(t, s.GetTemplate(257))
 	s.AddTemplate(testTemplate(256))
@@ -265,7 +266,7 @@ func TestSessionCheckReset(t *testing.T) {
 		},
 	} {
 		t.Run(testCase.title, func(t *testing.T) {
-			s := NewSession(glogger)
+			s := NewSession(logp.L())
 			s.lastSequence = testCase.current
 			prev, isReset := s.CheckReset(testCase.next)
 			assert.Equal(t, prev, testCase.current)
diff --git a/x-pack/filebeat/input/netflow/decoder/v9/v9.go b/x-pack/filebeat/input/netflow/decoder/v9/v9.go
index 106355585497..611a9dcba256 100644
--- a/x-pack/filebeat/input/netflow/decoder/v9/v9.go
+++ b/x-pack/filebeat/input/netflow/decoder/v9/v9.go
@@ -40,7 +40,9 @@ type NetflowV9Protocol struct {
 }
 
 func init() {
-	_ = protocol.Registry.Register(ProtocolName, New)
+	if err := protocol.Registry.Register(ProtocolName, New); err != nil {
+		panic(err)
+	}
 }
 
 func New(config config.Config) protocol.Protocol {
diff --git a/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go b/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go
index b260c6cae625..c2fc1c2fa14e 100644
--- a/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go
+++ b/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go
@@ -17,12 +17,16 @@ import (
 	"github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 func TestNetflowV9Protocol_ID(t *testing.T) {
-	assert.Equal(t, ProtocolID, New(config.Defaults()).Version())
+	assert.Equal(t, ProtocolID, New(config.Defaults(logp.L())).Version())
 }
 
 func TestNetflowProtocol_New(t *testing.T) {
-	proto := New(config.Defaults())
+	proto := New(config.Defaults(logp.L()))
 
 	assert.Nil(t, proto.Start())
 	assert.Equal(t, uint16(9), proto.Version())
@@ -35,7 +39,7 @@ func TestOptionTemplates(t *testing.T) {
 	key := MakeSessionKey(addr, sourceID, false)
 
 	t.Run("Single options template", func(t *testing.T) {
-		proto := New(config.Defaults())
+		proto := New(config.Defaults(logp.L()))
 		flows, err := proto.OnPacket(test.MakePacket([]uint16{
 			// Header
 			// Version, Count, Uptime, Ts, SeqNo, Source
@@ -64,7 +68,7 @@ func TestOptionTemplates(t *testing.T) {
 	})
 
 	t.Run("Multiple options template", func(t *testing.T) {
-		proto := New(config.Defaults())
+		proto := New(config.Defaults(logp.L()))
 		raw := test.MakePacket([]uint16{
 			// Header
 			// Version, Count, Uptime, Ts, SeqNo, Source
@@ -101,7 +105,7 @@ func TestOptionTemplates(t *testing.T) {
 	})
 
 	t.Run("records discarded", func(t *testing.T) {
-		proto := New(config.Defaults())
+		proto := New(config.Defaults(logp.L()))
 		raw := test.MakePacket([]uint16{
 			// Header
 			// Version, Count, Uptime, Ts, SeqNo, Source
@@ -163,8 +167,8 @@ func TestSessionReset(t *testing.T) {
 		3, 3,
 	}
 	t.Run("Reset disabled", func(t *testing.T) {
-		cfg := config.Defaults()
-		cfg.WithSequenceResetEnabled(false).WithLogOutput(logp.NewLogger("v9_test"))
+		cfg := config.Defaults(logp.NewLogger("v9_test"))
+		cfg.WithSequenceResetEnabled(false)
 		proto := New(cfg)
 		flows, err := proto.OnPacket(test.MakePacket(templatePacket), addr)
 		assert.NoError(t, err)
@@ -174,8 +178,8 @@ func TestSessionReset(t *testing.T) {
 		assert.Len(t, flows, 1)
 	})
 	t.Run("Reset enabled", func(t *testing.T) {
-		cfg := config.Defaults()
-		cfg.WithSequenceResetEnabled(true).WithLogOutput(logp.NewLogger("v9_test"))
+		cfg := config.Defaults(logp.NewLogger("v9_test"))
+		cfg.WithSequenceResetEnabled(true)
 		proto := New(cfg)
 		flows, err := proto.OnPacket(test.MakePacket(templatePacket), addr)
 		assert.NoError(t, err)
@@ -194,8 +198,8 @@ func TestSessionReset(t *testing.T) {
 			tmp[9] = uint16(sourceID & 0xffff)
 			return test.MakePacket(tmp)
 		}
-		cfg := config.Defaults()
-		cfg.WithSequenceResetEnabled(true).WithLogOutput(logp.NewLogger("v9_test"))
+		cfg := config.Defaults(logp.NewLogger("v9_test"))
+		cfg.WithSequenceResetEnabled(true)
 		proto := New(cfg)
 		flows, err := proto.OnPacket(mkPack(templatePacket, 1, 1000), addr)
 		assert.NoError(t, err)
@@ -215,7 +219,7 @@ func TestSessionReset(t *testing.T) {
 func TestCustomFields(t *testing.T) {
 	addr := test.MakeAddress(t, "127.0.0.1:12345")
 
-	conf := config.Defaults()
+	conf := config.Defaults(logp.L())
 	conf.WithCustomFields(fields.FieldDict{
 		fields.Key{FieldID: 33333}: &fields.Field{Name: "customField", Decoder: fields.String},
 	})
@@ -278,7 +282,7 @@ func TestSharedTemplates(t *testing.T) {
 	}
 
 	t.Run("Template sharing enabled", func(t *testing.T) {
-		cfg := config.Defaults()
+		cfg := config.Defaults(logp.L())
 		cfg.WithSharedTemplates(true)
 		proto := New(cfg)
 		flows, err := proto.OnPacket(test.MakePacket(templatePacket), templateAddr)
@@ -290,7 +294,7 @@ func TestSharedTemplates(t *testing.T) {
 	})
 
 	t.Run("Template sharing disabled", func(t *testing.T) {
-		cfg := config.Defaults()
+		cfg := config.Defaults(logp.L())
 		cfg.WithSharedTemplates(false)
 		proto := New(cfg)
 		flows, err := proto.OnPacket(test.MakePacket(templatePacket), templateAddr)
diff --git a/x-pack/filebeat/input/netflow/netflow_test.go b/x-pack/filebeat/input/netflow/netflow_test.go
index 4c0184580ca7..5bc4763ea7e6 100644
--- a/x-pack/filebeat/input/netflow/netflow_test.go
+++ b/x-pack/filebeat/input/netflow/netflow_test.go
@@ -49,6 +49,10 @@ const (
 	datSourceIP = "192.0.2.1"
 )
 
+func init() {
+	logp.TestingSetup()
+}
+
 // DatTests specifies the .dat files associated with test cases.
 type DatTests struct {
 	Tests map[string]TestCase `yaml:"tests"`
@@ -289,11 +293,10 @@ func readDatTests(t testing.TB) *DatTests {
 func getFlowsFromDat(t testing.TB, name string, testCase TestCase) TestResult {
 	t.Helper()
 
-	config := decoder.NewConfig().
+	config := decoder.NewConfig(logp.NewLogger("netflow_test")).
 		WithProtocols(protocol.Registry.All()...).
 		WithSequenceResetEnabled(false).
-		WithExpiration(0).
-		WithLogOutput(logp.NewLogger("netflow_test"))
+		WithExpiration(0)
 
 	for _, fieldFile := range testCase.Fields {
 		fields, err := LoadFieldDefinitionsFromFile(filepath.Join(fieldsDir, fieldFile))
@@ -351,12 +354,11 @@ func getFlowsFromPCAP(t testing.TB, name, pcapFile string) TestResult {
 	r, err := pcapgo.NewReader(f)
 	require.NoError(t, err)
 
-	config := decoder.NewConfig().
+	config := decoder.NewConfig(logp.NewLogger("netflow_test")).
 		WithProtocols(protocol.Registry.All()...).
 		WithSequenceResetEnabled(false).
 		WithExpiration(0).
-		WithCache(strings.HasSuffix(pcapFile, ".reversed.pcap")).
-		WithLogOutput(logp.NewLogger("netflow_test"))
+		WithCache(strings.HasSuffix(pcapFile, ".reversed.pcap"))
 
 	decoder, err := decoder.NewDecoder(config)
 	if !assert.NoError(t, err) {