Skip to content

Fork missing spans fix #460

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 2 commits into from
Nov 8, 2023
Merged

Fork missing spans fix #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b77678e
fix(agent.host): Missing spans when handling forked processes.
pvital Oct 17, 2023
3fa555c
chore(typo): Fixing typos on collector.base.py
pvital Oct 31, 2023
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
1 change: 0 additions & 1 deletion instana/agent/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ def can_send(self):
self._boot_pid = current_pid
logger.debug("Fork detected; Handling like a pro...")
self.handle_fork()
return False

if self.machine.fsm.current in ["wait4init", "good2go"]:
return True
Expand Down
12 changes: 6 additions & 6 deletions instana/collector/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, agent):
if env_is_test:
# Override span queue with a multiprocessing version
# The test suite runs background applications - some in background threads,
# others in background processes. This multiprocess queue allows us to collect
# others in background processes. This multiprocessing queue allows us to collect
# up spans from all sources.
import multiprocessing
self.span_queue = multiprocessing.Queue()
Expand All @@ -59,8 +59,8 @@ def __init__(self, agent):
# List of helpers that help out in data collection
self.helpers = []

# Lock used syncronize reporting - no updates when sending
# Used by the background reporting thread. Used to syncronize report attempts and so
# Lock used synchronize reporting - no updates when sending
# Used by the background reporting thread. Used to synchronize report attempts and so
# that we never have two in progress at once.
self.background_report_lock = threading.Lock()

Expand All @@ -70,7 +70,7 @@ def __init__(self, agent):
# Flag to indicate if start/shutdown state
self.started = False

# Startime of fetching metadata
# Start time of fetching metadata
self.fetching_start_time = 0

def is_reporting_thread_running(self):
Expand All @@ -95,7 +95,7 @@ def start(self):
timer.name = "Collector Timed Start"
timer.start()
return
logger.debug("Collecter.start non-fatal: call but thread already running (started: %s)", self.started)
logger.debug("BaseCollector.start non-fatal: call but thread already running (started: %s)", self.started)
return

if self.agent.can_send():
Expand All @@ -115,9 +115,9 @@ def shutdown(self, report_final=True):
e.g. If the host agent disappeared, we won't be able to report final data.
@return: None
"""
logger.debug("Collector.shutdown: Reporting final data.")
self.thread_shutdown.set()
if report_final is True:
logger.debug("Collector.shutdown: Reporting final data.")
self.prepare_and_report_data()
self.started = False

Expand Down