diff --git a/extension/fluentbitextension/process.go b/extension/fluentbitextension/process.go index 34b10552599..d5b1fdde47b 100644 --- a/extension/fluentbitextension/process.go +++ b/extension/fluentbitextension/process.go @@ -68,7 +68,7 @@ func constructArgs(tcpEndpoint string) []string { } } -func (pm *processManager) Start(ctx context.Context, host component.Host) error { +func (pm *processManager) Start(ctx context.Context, _ component.Host) error { childCtx, cancel := context.WithCancel(ctx) pm.cancel = cancel @@ -84,7 +84,7 @@ func (pm *processManager) Start(ctx context.Context, host component.Host) error } // Shutdown is invoked during service shutdown. -func (pm *processManager) Shutdown(ctx context.Context) error { +func (pm *processManager) Shutdown(context.Context) error { pm.cancel() t := time.NewTimer(5 * time.Second) diff --git a/extension/fluentbitextension/process_others.go b/extension/fluentbitextension/process_others.go index 281b98b7144..40920c0b325 100644 --- a/extension/fluentbitextension/process_others.go +++ b/extension/fluentbitextension/process_others.go @@ -16,6 +16,8 @@ package fluentbitextension -import "os/exec" +import ( + "os/exec" +) -func applyOSSpecificCmdModifications(cmd *exec.Cmd) {} +func applyOSSpecificCmdModifications(_ *exec.Cmd) {} diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index 2e1c52469bb..1ca07a4022c 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -63,7 +63,7 @@ func (f *Factory) CreateExtension(_ context.Context, params component.ExtensionC return nil, errors.New("only a single instance can be created per process") } - return newServer(*config, params.Logger) + return newServer(*config, params.Logger), nil } // See comment in CreateExtension how these are used. diff --git a/extension/healthcheckextension/healthcheckextension.go b/extension/healthcheckextension/healthcheckextension.go index 0f4b51336c6..6082fc26d2f 100644 --- a/extension/healthcheckextension/healthcheckextension.go +++ b/extension/healthcheckextension/healthcheckextension.go @@ -35,7 +35,7 @@ type healthCheckExtension struct { var _ component.PipelineWatcher = (*healthCheckExtension)(nil) -func (hc *healthCheckExtension) Start(ctx context.Context, host component.Host) error { +func (hc *healthCheckExtension) Start(_ context.Context, host component.Host) error { hc.logger.Info("Starting health_check extension", zap.Any("config", hc.config)) @@ -74,7 +74,7 @@ func (hc *healthCheckExtension) NotReady() error { return nil } -func newServer(config Config, logger *zap.Logger) (*healthCheckExtension, error) { +func newServer(config Config, logger *zap.Logger) *healthCheckExtension { hc := &healthCheckExtension{ config: config, logger: logger, @@ -84,5 +84,5 @@ func newServer(config Config, logger *zap.Logger) (*healthCheckExtension, error) hc.state.SetLogger(logger) - return hc, nil + return hc } diff --git a/extension/healthcheckextension/healthcheckextension_test.go b/extension/healthcheckextension/healthcheckextension_test.go index d8f66f94ab6..b7c0eb5fded 100644 --- a/extension/healthcheckextension/healthcheckextension_test.go +++ b/extension/healthcheckextension/healthcheckextension_test.go @@ -35,8 +35,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { Port: testutil.GetAvailablePort(t), } - hcExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + hcExt := newServer(config, zap.NewNop()) require.NotNil(t, hcExt) require.NoError(t, hcExt.Start(context.Background(), componenttest.NewNopHost())) @@ -84,8 +83,7 @@ func TestHealthCheckExtensionPortAlreadyInUse(t *testing.T) { config := Config{ Port: uint16(port), } - hcExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + hcExt := newServer(config, zap.NewNop()) require.NotNil(t, hcExt) // Health check will report port already in use in a goroutine, use the error waiting @@ -103,8 +101,7 @@ func TestHealthCheckMultipleStarts(t *testing.T) { Port: testutil.GetAvailablePort(t), } - hcExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + hcExt := newServer(config, zap.NewNop()) require.NotNil(t, hcExt) mh := componenttest.NewErrorWaitingHost() @@ -125,8 +122,7 @@ func TestHealthCheckMultipleShutdowns(t *testing.T) { Port: testutil.GetAvailablePort(t), } - hcExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + hcExt := newServer(config, zap.NewNop()) require.NotNil(t, hcExt) require.NoError(t, hcExt.Start(context.Background(), componenttest.NewNopHost())) @@ -139,8 +135,7 @@ func TestHealthCheckShutdownWithoutStart(t *testing.T) { Port: testutil.GetAvailablePort(t), } - hcExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + hcExt := newServer(config, zap.NewNop()) require.NotNil(t, hcExt) require.NoError(t, hcExt.Shutdown(context.Background())) diff --git a/extension/pprofextension/factory.go b/extension/pprofextension/factory.go index e566ae7c038..8af38686301 100644 --- a/extension/pprofextension/factory.go +++ b/extension/pprofextension/factory.go @@ -66,7 +66,7 @@ func (f *Factory) CreateExtension(_ context.Context, params component.ExtensionC return nil, errors.New("only a single instance can be created per process") } - return newServer(*config, params.Logger) + return newServer(*config, params.Logger), nil } // See comment in CreateExtension how these are used. diff --git a/extension/pprofextension/pprofextension.go b/extension/pprofextension/pprofextension.go index c9cf23a6cb6..09604cfdc8f 100644 --- a/extension/pprofextension/pprofextension.go +++ b/extension/pprofextension/pprofextension.go @@ -34,7 +34,7 @@ type pprofExtension struct { server http.Server } -func (p *pprofExtension) Start(ctx context.Context, host component.Host) error { +func (p *pprofExtension) Start(_ context.Context, host component.Host) error { // Start the listener here so we can have earlier failure if port is // already in use. ln, err := net.Listen("tcp", p.config.Endpoint) @@ -71,11 +71,9 @@ func (p *pprofExtension) Shutdown(context.Context) error { return p.server.Close() } -func newServer(config Config, logger *zap.Logger) (*pprofExtension, error) { - p := &pprofExtension{ +func newServer(config Config, logger *zap.Logger) *pprofExtension { + return &pprofExtension{ config: config, logger: logger, } - - return p, nil } diff --git a/extension/pprofextension/pprofextension_test.go b/extension/pprofextension/pprofextension_test.go index b6beba75d68..52483742c0b 100644 --- a/extension/pprofextension/pprofextension_test.go +++ b/extension/pprofextension/pprofextension_test.go @@ -35,8 +35,7 @@ func TestPerformanceProfilerExtensionUsage(t *testing.T) { MutexProfileFraction: 5, } - pprofExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + pprofExt := newServer(config, zap.NewNop()) require.NotNil(t, pprofExt) require.NoError(t, pprofExt.Start(context.Background(), componenttest.NewNopHost())) @@ -65,8 +64,7 @@ func TestPerformanceProfilerExtensionPortAlreadyInUse(t *testing.T) { config := Config{ Endpoint: endpoint, } - pprofExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + pprofExt := newServer(config, zap.NewNop()) require.NotNil(t, pprofExt) require.Error(t, pprofExt.Start(context.Background(), componenttest.NewNopHost())) @@ -77,8 +75,7 @@ func TestPerformanceProfilerMultipleStarts(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - pprofExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + pprofExt := newServer(config, zap.NewNop()) require.NotNil(t, pprofExt) require.NoError(t, pprofExt.Start(context.Background(), componenttest.NewNopHost())) @@ -93,8 +90,7 @@ func TestPerformanceProfilerMultipleShutdowns(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - pprofExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + pprofExt := newServer(config, zap.NewNop()) require.NotNil(t, pprofExt) require.NoError(t, pprofExt.Start(context.Background(), componenttest.NewNopHost())) @@ -107,8 +103,7 @@ func TestPerformanceProfilerShutdownWithoutStart(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - pprofExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + pprofExt := newServer(config, zap.NewNop()) require.NotNil(t, pprofExt) require.NoError(t, pprofExt.Shutdown(context.Background())) diff --git a/extension/zpagesextension/factory.go b/extension/zpagesextension/factory.go index 2e402d4e1a3..5bac64b594a 100644 --- a/extension/zpagesextension/factory.go +++ b/extension/zpagesextension/factory.go @@ -49,7 +49,7 @@ func (f *Factory) CreateDefaultConfig() configmodels.Extension { } // CreateExtension creates the extension based on this config. -func (f *Factory) CreateExtension(ctx context.Context, params component.ExtensionCreateParams, cfg configmodels.Extension) (component.ServiceExtension, error) { +func (f *Factory) CreateExtension(_ context.Context, params component.ExtensionCreateParams, cfg configmodels.Extension) (component.ServiceExtension, error) { config := cfg.(*Config) if config.Endpoint == "" { return nil, errors.New("\"endpoint\" is required when using the \"zpages\" extension") @@ -66,7 +66,7 @@ func (f *Factory) CreateExtension(ctx context.Context, params component.Extensio return nil, errors.New("only a single instance can be created per process") } - return newServer(*config, params.Logger) + return newServer(*config, params.Logger), nil } // See comment in CreateExtension how these are used. diff --git a/extension/zpagesextension/zpagesextension.go b/extension/zpagesextension/zpagesextension.go index e974b537686..c2e6ad64487 100644 --- a/extension/zpagesextension/zpagesextension.go +++ b/extension/zpagesextension/zpagesextension.go @@ -31,7 +31,7 @@ type zpagesExtension struct { server http.Server } -func (zpe *zpagesExtension) Start(ctx context.Context, host component.Host) error { +func (zpe *zpagesExtension) Start(_ context.Context, host component.Host) error { zPagesMux := http.NewServeMux() zpages.Handle(zPagesMux, "/debug") @@ -67,11 +67,9 @@ func (zpe *zpagesExtension) Shutdown(context.Context) error { return zpe.server.Close() } -func newServer(config Config, logger *zap.Logger) (*zpagesExtension, error) { - zpe := &zpagesExtension{ +func newServer(config Config, logger *zap.Logger) *zpagesExtension { + return &zpagesExtension{ config: config, logger: logger, } - - return zpe, nil } diff --git a/extension/zpagesextension/zpagesextension_test.go b/extension/zpagesextension/zpagesextension_test.go index 5bdc3abceec..f1abd6cbd5c 100644 --- a/extension/zpagesextension/zpagesextension_test.go +++ b/extension/zpagesextension/zpagesextension_test.go @@ -33,8 +33,7 @@ func TestZPagesExtensionUsage(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - zpagesExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + zpagesExt := newServer(config, zap.NewNop()) require.NotNil(t, zpagesExt) require.NoError(t, zpagesExt.Start(context.Background(), componenttest.NewNopHost())) @@ -63,8 +62,7 @@ func TestZPagesExtensionPortAlreadyInUse(t *testing.T) { config := Config{ Endpoint: endpoint, } - zpagesExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + zpagesExt := newServer(config, zap.NewNop()) require.NotNil(t, zpagesExt) require.Error(t, zpagesExt.Start(context.Background(), componenttest.NewNopHost())) @@ -75,8 +73,7 @@ func TestZPagesMultipleStarts(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - zpagesExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + zpagesExt := newServer(config, zap.NewNop()) require.NotNil(t, zpagesExt) require.NoError(t, zpagesExt.Start(context.Background(), componenttest.NewNopHost())) @@ -91,8 +88,7 @@ func TestZPagesMultipleShutdowns(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - zpagesExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + zpagesExt := newServer(config, zap.NewNop()) require.NotNil(t, zpagesExt) require.NoError(t, zpagesExt.Start(context.Background(), componenttest.NewNopHost())) @@ -105,8 +101,7 @@ func TestZPagesShutdownWithoutStart(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), } - zpagesExt, err := newServer(config, zap.NewNop()) - require.NoError(t, err) + zpagesExt := newServer(config, zap.NewNop()) require.NotNil(t, zpagesExt) require.NoError(t, zpagesExt.Shutdown(context.Background()))