fix timeseries (#12)

tinybirdco · Feb 14, 2025 · cc9ccdb · cc9ccdb
1 parent 4e5f9ab
commit cc9ccdb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/tinybird/endpoints/log_timeseries.pipe b/tinybird/endpoints/log_timeseries.pipe
@@ -62,11 +62,11 @@ SQL >
         {% end %}
         {% if date_diff_in_hours(start_date, end_date) > 24 * 7 %}
             countMerge(error_count) as error_count,
-            { % if defined(level) and level != 'ERROR' % }
+            {% if defined(level) and level != 'ERROR' %}
                 countMerge(total_requests) as total_requests,
-            { % else % }
+            {% else %}
                 0 as total_requests,
-            { % end % }
+            {% end %}
             round(error_count * 100.0 / if(total_requests == 0, 1, total_requests), 2) as error_rate,
             round(avgMerge(response_time_avg), 2) as avg_response_time,
             round(maxMerge(response_time_max), 2) as max_response_time

diff --git a/tinybird/tests/log_timeseries.yaml b/tinybird/tests/log_timeseries.yaml
@@ -598,3 +598,27 @@
     {"date":"2025-02-02 21:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
     {"date":"2025-02-02 22:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
     {"date":"2025-02-02 23:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+
+- name: level_timeseries
+  description: Test timeseries with level filter
+  parameters: start_date=2025-02-02%2000:00:00&end_date=2025-02-09%2023:59:59&level=INFO
+  expected_result: |
+    {"date":"2025-02-03 00:00:00.000","error_count":0,"total_requests":20,"error_rate":0,"avg_response_time":535.4,"max_response_time":924}
+    {"date":"2025-02-04 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-05 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-06 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-07 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-08 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-09 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+
+- name: level_timeseries_error
+  description: Test timeseries with error level filter
+  parameters: start_date=2025-02-02%2000:00:00&end_date=2025-02-09%2023:59:59&level=ERROR
+  expected_result: |
+    {"date":"2025-02-03 00:00:00.000","error_count":26,"total_requests":0,"error_rate":2600,"avg_response_time":576.23,"max_response_time":945}
+    {"date":"2025-02-04 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-05 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-06 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-07 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-08 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}
+    {"date":"2025-02-09 00:00:00.000","error_count":0,"total_requests":0,"error_rate":0,"avg_response_time":0,"max_response_time":0}