fix: Incorrect mapper behaviour for SDK metrics (#5816)

Author: khvn26

api/app_analytics/constants.py

@@ -20,7 +20,7 @@
     "Flagsmith-Application-Version": "client_application_version",
     "User-Agent": "user_agent",
 }
-LABELS: tuple[Label, ...] = get_args(Label)
+LABELS: tuple[str, ...] = tuple(str(label) for label in get_args(Label))
 
 NO_ANALYTICS_DATABASE_CONFIGURED_WARNING = (
     "No analytics database configured. "

api/app_analytics/mappers.py

@@ -1,12 +1,13 @@
 from collections import defaultdict
+from functools import partial
 from typing import Any, Iterable
 
 from django.http import HttpRequest
 from influxdb_client.client.flux_table import FluxTable
 from pydantic import Field, create_model
 from pydantic.type_adapter import TypeAdapter
 
-from app_analytics.constants import TRACK_HEADERS
+from app_analytics.constants import LABELS, TRACK_HEADERS
 from app_analytics.dataclasses import FeatureEvaluationData, UsageData
 from app_analytics.models import FeatureEvaluationRaw, Resource
 from app_analytics.types import (
@@ -29,6 +30,11 @@
 )
 _labels_type_adapter: TypeAdapter[Labels] = TypeAdapter(Labels)
 
+map_influx_record_values_to_labels = partial(
+    _labels_type_adapter.dump_python,
+    include=set(LABELS),
+)
+
 
 def map_annotated_api_usage_buckets_to_usage_data(
     api_usage_buckets: Iterable[AnnotatedAPIUsageBucket],
@@ -63,25 +69,43 @@ def map_annotated_api_usage_buckets_to_usage_data(
 def map_flux_tables_to_usage_data(
     flux_tables: list[FluxTable],
 ) -> list[UsageData]:
-    return [
-        UsageData(
-            day=(values := record.values)["_time"].strftime("%Y-%m-%d"),
-            labels=_labels_type_adapter.validate_python(values),
-            **{values["resource"]: values["_value"]},
-        )
-        for flux_table in flux_tables
-        for record in flux_table.records
-    ]
+    """
+    Aggregates API usage data buckets by date and labels.
+    Each resulting `UsageData` object contains the total count for each resource
+    for that date and labels combination.
+    """
+    data_by_key: dict[AnnotatedAPIUsageKey, UsageData] = {}
+    for flux_table in flux_tables:
+        for record in flux_table.records:
+            values = record.values
+            date = values["_time"].date()
+            labels: Labels = map_influx_record_values_to_labels(values)
+            key = AnnotatedAPIUsageKey(
+                date=date,
+                labels=tuple(labels.items()),
+            )
+            if key not in data_by_key:
+                data_by_key[key] = UsageData(
+                    day=date,
+                    labels=labels,
+                )
+            if resource := values.get("resource"):
+                setattr(
+                    data_by_key[key],
+                    resource,
+                    values["_value"],
+                )
+    return list(data_by_key.values())
 
 
 def map_flux_tables_to_feature_evaluation_data(
     flux_tables: list[FluxTable],
 ) -> list[FeatureEvaluationData]:
     return [
         FeatureEvaluationData(
-            day=(values := record.values)["_time"].strftime("%Y-%m-%d"),
+            day=(values := record.values)["_time"].date(),
             count=values["_value"],
-            labels=_labels_type_adapter.validate_python(values),
+            labels=map_influx_record_values_to_labels(values),
         )
         for flux_table in flux_tables
         for record in flux_table.records

api/app_analytics/serializers.py

@@ -119,6 +119,6 @@ def save(self, **kwargs: Any) -> None:
 
 def _get_label_fields() -> dict[str, serializers.Field[Any, Any, Any, Any]]:
     return {
-        str(label): serializers.CharField(allow_null=True, required=False)
+        label: serializers.CharField(allow_null=True, required=False)
         for label in LABELS
     }

api/tests/unit/app_analytics/test_unit_app_analytics_mappers.py

@@ -0,0 +1,81 @@
+from datetime import date, datetime
+
+from influxdb_client.client.flux_table import FluxRecord, FluxTable
+
+from app_analytics.dataclasses import FeatureEvaluationData, UsageData
+from app_analytics.mappers import (
+    map_flux_tables_to_feature_evaluation_data,
+    map_flux_tables_to_usage_data,
+)
+
+
+def test_map_flux_tables_to_feature_evaluation_data__returns_expected() -> None:
+    # Given
+    flux_table = FluxTable()
+    flux_table.records.append(
+        FluxRecord(
+            flux_table,
+            values={
+                "_time": datetime.fromisoformat("2023-10-01T00:00:00Z"),
+                "_value": 5,
+                "feature_name": "feature_1",
+                "client_application_name": "test-app",
+                "unrelated": "value",
+            },
+        )
+    )
+
+    # When
+    result = map_flux_tables_to_feature_evaluation_data(flux_tables=[flux_table])
+
+    # Then
+    assert result == [
+        FeatureEvaluationData(
+            day=date(2023, 10, 1),
+            count=5,
+            labels={"client_application_name": "test-app"},
+        )
+    ]
+
+
+def test_map_flux_tables_to_usage_data__returns_expected() -> None:
+    # Given
+    flux_table = FluxTable()
+    flux_table.records.append(
+        FluxRecord(
+            flux_table,
+            values={
+                "_time": datetime.fromisoformat("2023-10-01T00:00:00Z"),
+                "_value": 10,
+                "resource": "flags",
+                "client_application_name": "test-app",
+                "unrelated": "value",
+            },
+        ),
+    )
+    flux_table.records.append(
+        FluxRecord(
+            flux_table,
+            values={
+                "_time": datetime.fromisoformat("2023-10-01T00:00:00Z"),
+                "_value": 10,
+                "resource": "identities",
+                "client_application_name": "test-app",
+                "unrelated": "value",
+            },
+        ),
+    )
+
+    # When
+    result = map_flux_tables_to_usage_data(flux_tables=[flux_table])
+
+    # Then
+    assert result == [
+        UsageData(
+            day=date(2023, 10, 1),
+            flags=10,
+            traits=0,
+            identities=10,
+            labels={"client_application_name": "test-app"},
+        )
+    ]