Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(email): stop blocking inline email sends on an analytics flush (#124631)

Harley Alexanderbc2e932fe4b2
diff --git a/posthog/email.py b/posthog/email.py
index 8aed7fca2d0d..d37bfc6e483c 100644
--- a/posthog/email.py
+++ b/posthog/email.py
@@ -567,6 +567,12 @@ def _send_via_http(
if not is_http_email_service_available():
raise Exception("Missing Customer.io API key")
+ if not current_task or current_task.request.is_eager:
+ # The dedicated client blocks on its flush, which would hold the request. The web process keeps running,
+ # so the global client delivers in the background. ScopedCapture keeps the cloud-only guard.
+ _send_via_http_batch(ScopedCapture(posthoganalytics), to, campaign_key, template_name, properties, will_retry)
+ return
+
# A dedicated client, because the global one may never flush before a Celery worker exits.
with ph_scoped_capture(event_region=get_instance_region()) as capture:
_send_via_http_batch(capture, to, campaign_key, template_name, properties, will_retry)
diff --git a/posthog/test/test_email.py b/posthog/test/test_email.py
index b1331cc9e04f..a465820cf1f0 100644
--- a/posthog/test/test_email.py
+++ b/posthog/test/test_email.py
@@ -312,12 +312,12 @@ class TestEmail(BaseTest):
self.assertEqual(after - before, 2.0) # b failed + c never attempted; a succeeded
@parameterized.expand([("attempts_left", True), ("last_attempt", False)])
- @patch("posthog.email.ph_scoped_capture")
+ @override_settings(CLOUD_DEPLOYMENT="US")
+ @patch("posthog.email.posthoganalytics.capture")
@patch("posthog.email.requests.post")
def test_send_via_http_reraises_a_lost_database_connection_so_celery_retries(
- self, _name: str, will_retry: bool, mock_post: MagicMock, mock_scoped_capture: MagicMock
+ self, _name: str, will_retry: bool, mock_post: MagicMock, mock_capture: MagicMock
) -> None:
- mock_capture = mock_scoped_capture.return_value.__enter__.return_value
lost_connection = OperationalError("could not translate host name to address")
with (
@@ -343,10 +343,10 @@ class TestEmail(BaseTest):
[("OperationalError", will_retry)],
)
- @patch("posthog.email.ph_scoped_capture")
+ @override_settings(CLOUD_DEPLOYMENT="US")
+ @patch("posthog.email.posthoganalytics.capture")
@patch("posthog.email.requests.post")
- def test_send_via_http_success(self, mock_post, mock_scoped_capture) -> None:
- mock_capture = mock_scoped_capture.return_value.__enter__.return_value
+ def test_send_via_http_success(self, mock_post, mock_capture) -> None:
mock_response = MagicMock()
mock_response.status_code = 200
mock_response.json.return_value = {"delivery_id": "test_delivery_id", "queued_at": 1604977406}
@@ -387,6 +387,45 @@ class TestEmail(BaseTest):
},
)
+ @parameterized.expand(
+ [
+ ("request_on_cloud", None, "US", False, 1),
+ ("request_self_hosted", None, None, False, 0),
+ ("eager_task_on_cloud", True, "US", False, 1),
+ ("worker_task", False, "US", True, 0),
+ ]
+ )
+ @patch("posthog.email.ph_scoped_capture")
+ @patch("posthog.email.posthoganalytics.capture")
+ @patch("posthog.email.requests.post")
+ def test_send_via_http_flushes_events_only_in_a_worker(
+ self,
+ _name: str,
+ task_is_eager: bool | None,
+ cloud_deployment: str | None,
+ expect_scoped_client: bool,
+ expected_global_captures: int,
+ mock_post: MagicMock,
+ mock_global_capture: MagicMock,
+ mock_scoped_capture: MagicMock,
+ ) -> None:
+ mock_post.return_value = MagicMock(status_code=200, json=MagicMock(return_value={"delivery_id": "d-1"}))
+ task = None if task_is_eager is None else MagicMock(request=MagicMock(is_eager=task_is_eager))
+
+ with (
+ self.settings(CUSTOMER_IO_API_KEY="test-key", CLOUD_DEPLOYMENT=cloud_deployment),
+ patch("posthog.email.current_task", task),
+ ):
+ _send_via_http(
+ to=[{"raw_email": "[email protected]"}],
+ campaign_key="flush_path",
+ template_name="2fa_enabled",
+ properties={},
+ )
+
+ self.assertEqual(mock_scoped_capture.called, expect_scoped_client)
+ self.assertEqual(mock_global_capture.call_count, expected_global_captures)
+
@patch("posthog.email.requests.post")
def test_send_via_http_handles_decimal_values(self, mock_post) -> None:
mock_response = MagicMock()
@@ -551,7 +590,8 @@ class TestEmail(BaseTest):
),
]
)
- @patch("posthog.email.ph_scoped_capture")
+ @override_settings(CLOUD_DEPLOYMENT="US")
+ @patch("posthog.email.posthoganalytics.capture")
@patch("posthog.email.posthoganalytics.feature_enabled")
@patch("posthog.email.requests.post")
def test_send_via_http_routes_through_workflows_when_flag_matches(
@@ -564,9 +604,8 @@ class TestEmail(BaseTest):
expected_events: list[str],
mock_post: MagicMock,
mock_feature_enabled: MagicMock,
- mock_scoped_capture: MagicMock,
+ mock_capture: MagicMock,
) -> None:
- mock_capture = mock_scoped_capture.return_value.__enter__.return_value
mock_feature_enabled.return_value = flag_enabled
responses: list[MagicMock | Exception] = []
for status_code in status_codes:
@@ -614,7 +653,11 @@ class TestEmail(BaseTest):
mock_feature_enabled.assert_called_once_with(
"transactional-emails-via-workflows",
"user-1",
- person_properties={"email": "[email protected]", "transactional_email_template": "2fa_enabled"},
+ person_properties={
+ "email": "[email protected]",
+ "transactional_email_template": "2fa_enabled",
+ "region": "US",
+ },
send_feature_flag_events=False,
)
@@ -680,7 +723,7 @@ class TestEmail(BaseTest):
),
]
)
- @patch("posthog.email.ph_scoped_capture")
+ @patch("posthog.email.posthoganalytics.capture")
@patch("posthog.email.posthoganalytics.feature_enabled")
@patch("posthog.email.requests.post")
def test_retry_after_an_uncertain_workflows_send_stays_on_workflows_while_it_is_configured(
@@ -725,7 +768,7 @@ class TestEmail(BaseTest):
]
self.assertEqual(providers, expected_providers)
- @patch("posthog.email.ph_scoped_capture")
+ @patch("posthog.email.posthoganalytics.capture")
@patch("posthog.email.posthoganalytics.feature_enabled")
@patch("posthog.email.requests.post")
def test_batch_retry_keeps_an_unreachable_recipient_off_customer_io(
@@ -817,7 +860,7 @@ class TestEmail(BaseTest):
]
)
@patch.object(_send_email, "apply_async")
- @patch("posthog.email.ph_scoped_capture")
+ @patch("posthog.email.posthoganalytics.capture")
@patch("posthog.email.posthoganalytics.feature_enabled", return_value=True)
@patch("posthog.email.requests.post", side_effect=requests.ReadTimeout("no response"))
def test_inline_send_hands_a_retryable_failure_to_a_worker(