Skip to content

fix: Respect flush_queue_size when calling Workers.flush #63

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

Closed
wants to merge 3 commits into from
Closed

fix: Respect flush_queue_size when calling Workers.flush #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cce696
Respect flush_queue_size when calling Workers.flush
dsaxton-1password Nov 3, 2025
3f4fad8
Use self.storage.lock
dsaxton-1password Nov 10, 2025
4964d80
Fix
dsaxton-1password Nov 12, 2025
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
2 changes: 1 addition & 1 deletion src/amplitude/timeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def flush(self):
destination_futures = []
for destination in self.plugins[PluginType.DESTINATION]:
try:
destination_futures.append(destination.flush())
destination_futures.extend(destination.flush())
except Exception:
self.logger.exception("Error for flush events")
return destination_futures
Expand Down
23 changes: 13 additions & 10 deletions src/amplitude/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class Workers:

def __init__(self):
self.threads_pool = ThreadPoolExecutor(max_workers=16)
self.is_active = True
Expand Down Expand Up @@ -37,9 +36,14 @@ def stop(self):
self.threads_pool.shutdown()

def flush(self):
events = self.storage.pull_all()
if events:
return self.threads_pool.submit(self.send, events)
futures = []
with self.storage.lock:
while True:
events = self.storage.pull(self.configuration.flush_queue_size)
if not events:
break
futures.append(self.threads_pool.submit(self.send, events))
return futures

def send(self, events):
url = self.configuration.server_url
Expand All @@ -51,23 +55,22 @@ def send(self, events):
self.configuration.logger.error("Invalid API Key")

def get_payload(self, events) -> bytes:
payload_body = {
"api_key": self.configuration.api_key,
"events": []
}
payload_body = {"api_key": self.configuration.api_key, "events": []}
for event in events:
event_body = event.get_event_body()
if event_body:
payload_body["events"].append(event_body)
if self.configuration.options:
payload_body["options"] = self.configuration.options
return json.dumps(payload_body, sort_keys=True).encode('utf8')
return json.dumps(payload_body, sort_keys=True).encode("utf8")

def buffer_consumer(self):
try:
if self.is_active:
with self.storage.lock:
self.storage.lock.wait(self.configuration.flush_interval_millis / 1000)
self.storage.lock.wait(
self.configuration.flush_interval_millis / 1000
)
while True:
if not self.storage.total_events:
break
Expand Down