Merge branch 'main' into v1

* main:
  fix: readiness hook back off (#2718)
  fix: skip unhealthy (#2717)
  fix: filter context errors from log production (#2715)

Author: mdelapenya

container_started.go

@@ -165,7 +165,16 @@ func (c *DockerContainer) StopLogProduction() error {
 
 	c.logProductionWaitGroup.Wait()
 
-	return <-c.logProductionError
+	if err := <-c.logProductionError; err != nil {
+		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
+			// Returning context errors is not useful for the consumer.
+			return nil
+		}
+
+		return err
+	}
+
+	return nil
 }
 
 func (c *DockerContainer) WithLogProductionTimeout(timeout time.Duration) {

lifecycle_ready.go

@@ -17,15 +17,15 @@ var defaultReadinessHook = func() LifecycleHooks {
 			func(ctx context.Context, c StartedContainer) error {
 				// wait until all the exposed ports are mapped:
 				// it will be ready when all the exposed ports are mapped,
-				// checking every 50ms, up to 5s, and failing if all the
-				// exposed ports are not mapped in that time.
+				// checking every 50ms, up to 1s, and failing if all the
+				// exposed ports are not mapped in 5s.
 				dockerContainer := c.(*DockerContainer)
 
 				b := backoff.NewExponentialBackOff()
 
 				b.InitialInterval = 50 * time.Millisecond
-				b.MaxElapsedTime = 1 * time.Second
-				b.MaxInterval = 5 * time.Second
+				b.MaxElapsedTime = 5 * time.Second
+				b.MaxInterval = time.Duration(float64(time.Second) * backoff.DefaultRandomizationFactor)
 
 				err := backoff.RetryNotify(
 					func() error {

reaper_test.go

@@ -210,7 +210,7 @@ func TestReaperReusedIfHealthy(t *testing.T) {
 		t.Skip("Ryuk is disabled, skipping test")
 	}
 
-	SkipIfContainerRuntimeIsNotHealthy(&testing.T{})
+	SkipIfContainerRuntimeIsNotHealthy(t)
 
 	ctx := context.Background()
 
@@ -240,7 +240,7 @@ func TestRecreateReaperIfTerminated(t *testing.T) {
 		t.Skip("Ryuk is disabled, skipping test")
 	}
 
-	SkipIfContainerRuntimeIsNotHealthy(&testing.T{})
+	SkipIfContainerRuntimeIsNotHealthy(t)
 
 	ctx := context.Background()