Skip to content

Add thread lock to EventTracker #4019

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
hawflau merged 2 commits into from
Jun 30, 2022
Merged

Add thread lock to EventTracker #4019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa6ec9c
Add thread lock to EventTracker
Leo10Gama Jun 29, 2022
1b851c4
Place lock in appropriate methods
Leo10Gama Jun 29, 2022
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
11 changes: 8 additions & 3 deletions samcli/lib/telemetry/event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from enum import Enum
import logging
import threading
from typing import List

from samcli.local.common.runtime_template import INIT_RUNTIMES
Expand Down Expand Up @@ -84,6 +85,7 @@ class EventTracker:
"""Class to track and recreate Events as they occur."""

_events: List[Event] = []
_event_lock = threading.Lock()

@staticmethod
def track_event(event_name: str, event_value: str):
Expand Down Expand Up @@ -114,18 +116,21 @@ def track_event(event_name: str, event_value: str):
return some_value
"""
try:
EventTracker._events.append(Event(event_name, event_value))
with EventTracker._event_lock:
EventTracker._events.append(Event(event_name, event_value))
except EventCreationError as e:
LOG.debug("Error occurred while trying to track an event: %s", e)

@staticmethod
def get_tracked_events() -> List[Event]:
return EventTracker._events
with EventTracker._event_lock:
return EventTracker._events

@staticmethod
def clear_trackers():
"""Clear the current list of tracked Events before the next session."""
EventTracker._events = []
with EventTracker._event_lock:
EventTracker._events = []


class EventCreationError(Exception):
Expand Down