Revert "Relax leak test condition from Healthy to not Failed. (#5301)" (

#5356)

This reverts commit b832c15.

testing/integration/agent_long_running_leak_test.go

@@ -9,7 +9,6 @@ package integration
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net"
 	"net/http"
@@ -30,9 +29,7 @@ import (
 	"github.com/elastic/elastic-agent-libs/api/npipe"
 	"github.com/elastic/elastic-agent-libs/kibana"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths"
-	"github.com/elastic/elastic-agent/pkg/control/v2/client"
 	"github.com/elastic/elastic-agent/pkg/control/v2/cproto"
-	"github.com/elastic/elastic-agent/pkg/core/process"
 	atesting "github.com/elastic/elastic-agent/pkg/testing"
 	"github.com/elastic/elastic-agent/pkg/testing/define"
 	"github.com/elastic/elastic-agent/pkg/testing/tools"
@@ -163,10 +160,7 @@ func (runner *ExtendedRunner) TestHandleLeak() {
 		case <-timer.C:
 			done = true
 		case <-ticker.C:
-			// https://github.com/elastic/elastic-agent/issues/5300
-			// Ideally we would require healthy but we currently report as DEGRADED due to unexpected permissions errors
-			// accessing some process metrics. Ensure the leak tests still run as long while this is the case.
-			err := runner.IsHealthyOrDegraded(ctx)
+			err := runner.agentFixture.IsHealthy(ctx)
 			require.NoError(runner.T(), err)
 			// iterate through our watchers, update them
 			for _, mon := range runner.resourceWatchers {
@@ -211,8 +205,6 @@ func (runner *ExtendedRunner) TestHandleLeak() {
 
 // CheckHealthAtStartup ensures all the beats and agent are healthy and working before we continue
 func (runner *ExtendedRunner) CheckHealthAtStartup(ctx context.Context) {
-	runner.T().Helper()
-
 	// because we need to separately fetch the PIDs, wait until everything is healthy before we look for running beats
 	compDebugName := ""
 	require.Eventually(runner.T(), func() bool {
@@ -241,11 +233,7 @@ func (runner *ExtendedRunner) CheckHealthAtStartup(ctx context.Context) {
 				}
 			}
 			runner.T().Logf("component state: %s", comp.Message)
-
-			// https://github.com/elastic/elastic-agent/issues/5300
-			// Ideally we would require healthy but we currently report as DEGRADED due to unexpected permissions errors
-			// accessing some process metrics. Ensure the leak tests still run as long while this is the case.
-			if !isHealthyOrDegraded(comp.State) {
+			if comp.State != int(cproto.State_HEALTHY) {
 				compDebugName = comp.Name
 				allHealthy = false
 			}
@@ -254,26 +242,6 @@ func (runner *ExtendedRunner) CheckHealthAtStartup(ctx context.Context) {
 	}, runner.healthCheckTime, runner.healthCheckRefreshTime, "install never became healthy: components did not return a healthy state: %s", compDebugName)
 }
 
-func (runner *ExtendedRunner) IsHealthyOrDegraded(ctx context.Context, opts ...process.CmdOption) error {
-	runner.T().Helper()
-
-	status, err := runner.agentFixture.ExecStatus(ctx, opts...)
-	if err != nil {
-		return fmt.Errorf("agent status returned an error: %w", err)
-	}
-
-	if !isHealthyOrDegraded(status.State) {
-		return fmt.Errorf("agent isn't healthy or degraded, current status: %s",
-			client.State(status.State))
-	}
-
-	return nil
-}
-
-func isHealthyOrDegraded(state int) bool {
-	return state == int(cproto.State_HEALTHY) || state == int(cproto.State_DEGRADED)
-}
-
 /*
 =============================================================================
 Watchers for checking resource usage