Wait for components to start in workdir management test (#10961)

* Wait for components to start in workdir management test

* Set log level to debug in test

* Improve error reporting in command runtime

* Fix assertion

Author: swiatekm

pkg/component/runtime/command.go

@@ -375,7 +375,7 @@ func (c *commandRuntime) start(comm Communicator) error {
 	}
 
 	if err := c.monitor.Prepare(c.current.ID); err != nil {
-		return err
+		return fmt.Errorf("failed to prepare component monitoring resources: %w", err)
 	}
 	args := c.monitor.EnrichArgs(c.current.ID, c.getSpecBinaryName(), cmdSpec.Args)
 
@@ -391,7 +391,7 @@ func (c *commandRuntime) start(comm Communicator) error {
 		process.WithEnv(env),
 		process.WithCmdOptions(attachOutErr(c.logStd, c.logErr), dirPath(workDir)))
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to start process: %w", err)
 	}
 
 	c.proc = proc
@@ -430,7 +430,11 @@ func (c *commandRuntime) stop(ctx context.Context) error {
 	}(c.proc, cmdSpec.Timeouts.Stop)
 
 	c.log.Debugf("gracefully stopping pid %d", c.proc.PID)
-	return c.proc.Stop()
+
+	if stopErr := c.proc.Stop(); stopErr != nil {
+		return fmt.Errorf("failed to stop process %s: %w", c.proc.Cmd.String(), stopErr)
+	}
+	return nil
 }
 
 func (c *commandRuntime) startWatcher(info *process.Info, comm Communicator) {

testing/integration/ess/beat_receivers_test.go

@@ -927,7 +927,7 @@ func TestComponentWorkDir(t *testing.T) {
 	type configOptions struct {
 		RuntimeExperimental string
 	}
-	configTemplate := `agent.logging.level: info
+	configTemplate := `agent.logging.level: debug
 agent.logging.to_stderr: true
 agent.logging.to_files: false
 inputs:
@@ -978,13 +978,14 @@ agent.monitoring.enabled: false
 	var componentID, componentWorkDir string
 	var workDirCreated time.Time
 
-	// wait for component to appear in status
+	// wait for component to appear in status and be healthy
 	require.EventuallyWithT(t, func(collect *assert.CollectT) {
 		var statusErr error
 		status, statusErr := fixture.ExecStatus(ctx)
 		require.NoError(collect, statusErr)
 		require.Equal(collect, 1, len(status.Components))
 		componentStatus := status.Components[0]
+		assert.Equal(collect, cproto.State_HEALTHY, cproto.State(componentStatus.State))
 		componentID = componentStatus.ID
 	}, 2*time.Minute, 5*time.Second)
 
@@ -1001,13 +1002,17 @@ agent.monitoring.enabled: false
 	err = fixture.Configure(ctx, receiverConfig)
 	require.NoError(t, err)
 
+	// wait for component to appear in status and be healthy or degraded
 	require.EventuallyWithT(t, func(collect *assert.CollectT) {
 		var statusErr error
 		status, statusErr := fixture.ExecStatus(ctx)
 		require.NoError(collect, statusErr)
 		require.Equal(collect, 1, len(status.Components))
 		componentStatus := status.Components[0]
-		assert.Equal(collect, "beats-receiver", componentStatus.VersionInfo.Name)
+		require.Equal(collect, "beats-receiver", componentStatus.VersionInfo.Name)
+		componentState := cproto.State(componentStatus.State)
+		assert.Truef(collect, componentState == cproto.State_HEALTHY || componentState == cproto.State_DEGRADED,
+			"component state should be HEALTHY or DEGRADED, got %s", componentState.String())
 	}, 2*time.Minute, 5*time.Second)
 
 	// the component working directory should still exist