Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Revert "Include 0 length pageviews in time_on_page calculation"

Uku Taht5b893bde39c4
diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex
index 34b22a29bd..72eb1e651f 100644
--- a/lib/plausible/stats/breakdown.ex
+++ b/lib/plausible/stats/breakdown.ex
@@ -232,12 +232,12 @@ defmodule Plausible.Stats.Breakdown do
time_query = "
SELECT
p,
- toUInt32(avg(td)) as avgTime
+ round(sum(td)/count(case when p2 != p then 1 end)) as avgTime
FROM
(SELECT
p,
p2,
- if(s=s2, sum(t2-t), 0) as td
+ sum(t2-t) as td
FROM
(SELECT
*,
@@ -245,8 +245,8 @@ defmodule Plausible.Stats.Breakdown do
neighbor(p, 1) as p2,
neighbor(s, 1) as s2
FROM (#{base_query_raw}))
- WHERE p IN tuple(?)
- GROUP BY p,p2,s,s2)
+ WHERE s=s2 AND p IN tuple(?)
+ GROUP BY p,p2,s)
GROUP BY p"
{:ok, res} = ClickhouseRepo.query(time_query, base_query_raw_params ++ [pages])
diff --git a/test/plausible_web/controllers/CSVs/30d-filter-path/pages.csv b/test/plausible_web/controllers/CSVs/30d-filter-path/pages.csv
index 6ba8391cf8..711f9fb0b6 100644
--- a/test/plausible_web/controllers/CSVs/30d-filter-path/pages.csv
+++ b/test/plausible_web/controllers/CSVs/30d-filter-path/pages.csv
@@ -1,2 +1,2 @@
name,visitors,bounce_rate,time_on_page
-/some-other-page,1,,60
+/some-other-page,1,,60.0
diff --git a/test/plausible_web/controllers/CSVs/30d/pages.csv b/test/plausible_web/controllers/CSVs/30d/pages.csv
index 211b9d1776..dc8d9adb4f 100644
--- a/test/plausible_web/controllers/CSVs/30d/pages.csv
+++ b/test/plausible_web/controllers/CSVs/30d/pages.csv
@@ -1,3 +1,3 @@
name,visitors,bounce_rate,time_on_page
-/,4,75,0
-/some-other-page,1,,60
+/,4,75,
+/some-other-page,1,,60.0
diff --git a/test/plausible_web/controllers/CSVs/6m/pages.csv b/test/plausible_web/controllers/CSVs/6m/pages.csv
index 5c86924cd1..33187b985b 100644
--- a/test/plausible_web/controllers/CSVs/6m/pages.csv
+++ b/test/plausible_web/controllers/CSVs/6m/pages.csv
@@ -1,3 +1,3 @@
name,visitors,bounce_rate,time_on_page
-/,5,80,0
-/some-other-page,1,,60
+/,5,80,
+/some-other-page,1,,60.0
diff --git a/test/plausible_web/controllers/api/stats_controller/pages_test.exs b/test/plausible_web/controllers/api/stats_controller/pages_test.exs
index 39aa3c1506..e9db51ec95 100644
--- a/test/plausible_web/controllers/api/stats_controller/pages_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/pages_test.exs
@@ -52,14 +52,14 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
assert json_response(conn, 200) == [
%{
"bounce_rate" => 50.0,
- "time_on_page" => 450,
+ "time_on_page" => 900.0,
"visitors" => 2,
"pageviews" => 2,
"name" => "/"
},
%{
"bounce_rate" => nil,
- "time_on_page" => 0,
+ "time_on_page" => nil,
"visitors" => 1,
"pageviews" => 1,
"name" => "/some-other-page"