Skip to content

Fix Instability in CI Caused by Health Check Tests #1584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmstepanek merged 1 commit into from
Nov 17, 2025
Merged

Fix Instability in CI Caused by Health Check Tests #1584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions tests/agent_features/test_agent_control_health_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get_health_file_contents(tmp_path):
return contents


@pytest.fixture(scope="module", autouse=True)
@pytest.fixture(autouse=True)
def restore_settings_fixture():
# Backup settings from before this test file runs
original_settings = global_settings()
Expand All @@ -51,6 +51,10 @@ def restore_settings_fixture():
original_settings.__dict__.clear()
original_settings.__dict__.update(backup)

# Re-initialize the agent to restore the settings
_reset_configuration_done()
initialize()


@pytest.mark.parametrize("file_uri", ["", "file://", "/test/dir", "foo:/test/dir"])
def test_invalid_file_directory_supplied(monkeypatch, file_uri):
Expand Down Expand Up @@ -155,10 +159,18 @@ def test_no_override_on_unhealthy_shutdown(monkeypatch, tmp_path):


def test_health_check_running_threads(monkeypatch, tmp_path):
running_threads = threading.enumerate()
# Only the main thread should be running since not agent control env vars are set
assert len(running_threads) == 1
# If the Activate-Session thread is still active, give it time to close before we proceed
timeout = 30.0
while len(threading.enumerate()) != 1 and timeout > 0:
time.sleep(0.1)
timeout -= 0.1

# Only the main thread should be running since no agent control env vars are set
assert len(threading.enumerate()) == 1, (
f"Expected only the main thread to be running before the test starts. Got: {threading.enumerate()}"
)

# Setup expected env vars to run agent control health check
monkeypatch.setenv("NEW_RELIC_AGENT_CONTROL_ENABLED", "True")
file_path = tmp_path.as_uri()
monkeypatch.setenv("NEW_RELIC_AGENT_CONTROL_HEALTH_DELIVERY_LOCATION", file_path)
Expand All @@ -180,6 +192,7 @@ def test_proxy_error_status(monkeypatch, tmp_path):
file_path = tmp_path.as_uri()
monkeypatch.setenv("NEW_RELIC_AGENT_CONTROL_HEALTH_DELIVERY_LOCATION", file_path)

# Re-initialize the agent to allow the health check thread to start
_reset_configuration_done()
initialize()

Expand Down Expand Up @@ -209,6 +222,7 @@ def test_multiple_activations_running_threads(monkeypatch, tmp_path):
file_path = tmp_path.as_uri()
monkeypatch.setenv("NEW_RELIC_AGENT_CONTROL_HEALTH_DELIVERY_LOCATION", file_path)

# Re-initialize the agent to allow the health check thread to start and assert that it did
_reset_configuration_done()
initialize()

Expand Down
Loading