Fix merge issues in separate commit to highlight them

comp/core/log/logimpl/logger.go

@@ -22,18 +22,22 @@ import (
 )
 
 // Module defines the fx options for this component.
-var Module fx.Option = fxutil.Component(
-	fx.Provide(newAgentLogger),
-)
+func Module() fxutil.Module {
+	return fxutil.Component(
+		fx.Provide(newAgentLogger),
+	)
+}
 
 // TraceModule defines the fx options for this component in its Trace variant.
 //
 // TODO(components): move this comp/trace; that component shall implement the
 //
 //	log.Component interface.
-var TraceModule fx.Option = fxutil.Component(
-	fx.Provide(newTraceLogger),
-)
+func TraceModule() fxutil.Module {
+	return fxutil.Component(
+		fx.Provide(newTraceLogger),
+	)
+}
 
 // logger implements the component
 type logger struct {

comp/core/log/logimpl/mock.go

@@ -24,14 +24,18 @@ import (
 )
 
 // MockModule defines the fx options for the mock component.
-var MockModule fx.Option = fxutil.Component(
-	fx.Provide(newMockLogger),
-)
+func MockModule() fxutil.Module {
+	return fxutil.Component(
+		fx.Provide(newMockLogger),
+	)
+}
 
 // TraceMockModule defines the fx options for the mock component in its Trace variant.
-var TraceMockModule fx.Option = fxutil.Component(
-	fx.Provide(newTraceMockLogger),
-)
+func TraceMockModule() fxutil.Module {
+	return fxutil.Component(
+		fx.Provide(newTraceMockLogger),
+	)
+}
 
 // tbWriter is an implementation of io.Writer that sends lines to
 // testing.TB#Log.

pkg/collector/corechecks/snmp/snmp_test.go

@@ -58,7 +58,7 @@ type deps struct {
 }
 
 func createDeps(t *testing.T) deps {
-	return fxutil.Test[deps](t, demultiplexer.MockModule(), defaultforwarder.MockModule, config.MockModule(), logimpl.MockModule)
+	return fxutil.Test[deps](t, demultiplexer.MockModule(), defaultforwarder.MockModule(), config.MockModule(), logimpl.MockModule())
 }
 
 func Test_Run_simpleCase(t *testing.T) {