Skip to content

Agent Connectivity: Fix timeout handling #255

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
merged 1 commit into from
Aug 20, 2020
Merged

Agent Connectivity: Fix timeout handling #255

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion instana/agent/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
"""
from __future__ import absolute_import

import json
import os
import json
import urllib3
import requests
from datetime import datetime

from ..log import logger
Expand Down Expand Up @@ -230,6 +232,10 @@ def report_data_payload(self, payload):
# The host agent returned something indicating that is has a request for us that we
# need to process.
self.handle_agent_tasks(json.loads(response.content)[0])
except requests.exceptions.ConnectionError:
pass
except urllib3.exceptions.MaxRetryError:
pass
except Exception as exc:
logger.debug("report_data_payload: Instana host agent connection error (%s)", type(exc), exc_info=True)
return response
Expand Down
4 changes: 4 additions & 0 deletions instana/collector/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ def prepare_and_report_data(self):
self.agent.machine.fsm.ready()
else:
return

if self.agent.machine.fsm.current == "good2go" and self.agent.is_timed_out():
logger.info("The Instana host agent has gone offline or is no longer reachable for > 1 min. Will retry periodically.")
self.agent.reset()
except Exception:
logger.debug('Harmless state machine thread disagreement. Will self-correct on next timer cycle.')

Expand Down