Skip to content
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.

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

infra: run influxdb feature evaluation in thread #4125

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/app_analytics/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ def post(self, request, *args, **kwargs):
)
)
elif settings.INFLUXDB_TOKEN:
track_feature_evaluation_influxdb.delay(
# Due to load issues on the task processor, we
# explicitly run this task in a separate thread.
# TODO: batch influx data to prevent large amounts
# of tasks.
track_feature_evaluation_influxdb.run_in_thread(
args=(
request.environment.id,
request.data,
Expand Down
3 changes: 2 additions & 1 deletion api/task_processor/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ def delay(
def run_in_thread(
self,
*,
args: tuple[typing.Any] = (),
args: tuple[typing.Any, ...] = (),
kwargs: dict[str, typing.Any] | None = None,
) -> None:
kwargs = kwargs or {}
_validate_inputs(*args, **kwargs)
thread = Thread(target=self.unwrapped, args=args, kwargs=kwargs, daemon=True)

Expand Down
35 changes: 35 additions & 0 deletions api/tests/unit/app_analytics/test_unit_app_analytics_track.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

import pytest
from app_analytics.track import (
track_feature_evaluation_influxdb,
track_request_googleanalytics,
track_request_influxdb,
)
from pytest_mock import MockerFixture


@pytest.mark.parametrize(
Expand Down Expand Up @@ -129,3 +131,36 @@ def test_track_request_does_not_send_data_to_influxdb_for_not_tracked_uris(

# Then
MockInfluxDBWrapper.assert_not_called()


def test_track_feature_evaluation_influxdb(mocker: MockerFixture) -> None:
# Given
mock_influxdb_wrapper = mock.MagicMock()
mocker.patch(
"app_analytics.track.InfluxDBWrapper", return_value=mock_influxdb_wrapper
)

data = {
"foo": 12,
"bar": 19,
"baz": 44,
}
environment_id = 1

# When
track_feature_evaluation_influxdb(
environment_id=environment_id, feature_evaluations=data
)

# Then
calls = mock_influxdb_wrapper.add_data_point.call_args_list
assert len(calls) == 3
for i, feature_name in enumerate(data):
assert calls[i].args[0] == "request_count"
assert calls[i].args[1] == data[feature_name]
assert calls[i].kwargs["tags"] == {
"environment_id": environment_id,
"feature_id": feature_name,
}

mock_influxdb_wrapper.write.assert_called_once_with()
19 changes: 12 additions & 7 deletions api/tests/unit/app_analytics/test_unit_app_analytics_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ def test_sdk_analytics_allows_valid_data(mocker, settings, environment, feature)

# Then
assert response.status_code == status.HTTP_200_OK
mocked_track_feature_eval.delay.assert_called_once_with(args=(environment.id, data))
mocked_track_feature_eval.run_in_thread.assert_called_once_with(
args=(environment.id, data)
)


def test_get_usage_data(mocker, admin_client, organisation):
Expand Down Expand Up @@ -445,8 +447,10 @@ def test_set_sdk_analytics_flags_v1_to_influxdb(
api_client.credentials(HTTP_X_ENVIRONMENT_KEY=environment.api_key)
feature_request_count = 2
data = {feature.name: feature_request_count}
mock = mocker.patch("app_analytics.track.InfluxDBWrapper")
add_data_point_mock = mock.return_value.add_data_point

mocked_track_feature_eval = mocker.patch(
"app_analytics.views.track_feature_evaluation_influxdb"
)

# When
response = api_client.post(
Expand All @@ -455,8 +459,9 @@ def test_set_sdk_analytics_flags_v1_to_influxdb(

# Then
assert response.status_code == status.HTTP_200_OK
add_data_point_mock.assert_called_with(
"request_count",
feature_request_count,
tags={"feature_id": feature.name, "environment_id": environment.id},
mocked_track_feature_eval.run_in_thread.assert_called_once_with(
args=(
environment.id,
data,
)
)
Loading