Compare commits

..

2 Commits

Author SHA1 Message Date
Adam Rutkowski 6019ebe146 Ensure hit rate is tracked on `get_or_store` 3 years ago
Adam Rutkowski 317cb8aa85 Reapply "Replace caching engine (#3878)" (#3883)
This reverts commit c5881cdc6d.
3 years ago

@ -1,42 +1,26 @@
name: Elixir CI name: Elixir CI
on: on:
pull_request:
push: push:
branches: [master, stable] branches: [master, stable]
pull_request:
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
env:
CACHE_VERSION: v7
PERSISTENT_CACHE_DIR: cached
jobs: jobs:
build: build:
name: "Build and test (${{ matrix.mix_env }}, ${{ matrix.postgres_image }}${{ matrix.test_experimental_reduced_joins == '1' && ', experimental_reduced_joins' || '' }})" name: Build and test
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
mix_env: ['test', 'small_test'] postgres_version: [15, 16]
postgres_image: ['postgres:16']
test_experimental_reduced_joins: ['0']
include:
- mix_env: 'test'
postgres_image: 'postgres:15'
test_experimental_reduced_joins: '0'
- mix_env: 'test'
postgres_image: 'postgres:16'
test_experimental_reduced_joins: '1'
env:
MIX_ENV: ${{ matrix.mix_env }}
TEST_EXPERIMENTAL_REDUCED_JOINS: ${{ matrix.test_experimental_reduced_joins }}
services: services:
postgres: postgres:
image: ${{ matrix.postgres_image }} image: postgres:${{ matrix.postgres_version }}
ports: ports:
- 5432:5432 - 5432:5432
env: env:
@ -46,6 +30,7 @@ jobs:
--health-interval 10s --health-interval 10s
--health-timeout 5s --health-timeout 5s
--health-retries 5 --health-retries 5
clickhouse: clickhouse:
image: clickhouse/clickhouse-server:23.3.7.5-alpine image: clickhouse/clickhouse-server:23.3.7.5-alpine
ports: ports:
@ -56,91 +41,43 @@ jobs:
--health-interval 10s --health-interval 10s
--health-timeout 5s --health-timeout 5s
--health-retries 5 --health-retries 5
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: marocchino/tool-versions-action@v1
id: versions
- uses: erlef/setup-beam@v1
with:
elixir-version: ${{ steps.versions.outputs.elixir }}
otp-version: ${{ steps.versions.outputs.erlang }}
- uses: actions/cache@v4
with:
path: |
deps
_build
tracker/node_modules
priv/tracker/js
${{ env.PERSISTENT_CACHE_DIR }}
key: ${{ env.MIX_ENV }}-${{ env.CACHE_VERSION }}-${{ github.head_ref || github.ref }}-${{ hashFiles('**/mix.lock') }}
restore-keys: |
${{ env.MIX_ENV }}-${{ env.CACHE_VERSION }}-${{ github.head_ref || github.ref }}-
${{ env.MIX_ENV }}-${{ env.CACHE_VERSION }}-refs/heads/master-
- name: Check for changes in tracker/**
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
tracker:
- 'tracker/**'
- name: Check if priv/tracker/js/plausible.js exists
run: |
if [ -f priv/tracker/js/plausible.js ]; then
echo "HAS_BUILT_TRACKER=true" >> $GITHUB_ENV
else
echo "HAS_BUILT_TRACKER=false" >> $GITHUB_ENV
fi
- run: npm install --prefix ./tracker
if: steps.changes.outputs.tracker == 'true' || env.HAS_BUILT_TRACKER == 'false'
- run: npm run deploy --prefix ./tracker
if: steps.changes.outputs.tracker == 'true' || env.HAS_BUILT_TRACKER == 'false'
- run: mix deps.get --only $MIX_ENV
- run: mix compile --warnings-as-errors --all-warnings
- run: mix do ecto.create, ecto.migrate
- run: mix run -e "Tzdata.ReleaseUpdater.poll_for_update"
- run: mix test --include slow --include minio --max-failures 1 --warnings-as-errors
if: env.MIX_ENV == 'test'
- run: mix test --include slow --max-failures 1 --warnings-as-errors
if: env.MIX_ENV == 'small_test'
static:
name: Static checks (format, credo, dialyzer)
env:
MIX_ENV: test
runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Read .tool-versions
- uses: marocchino/tool-versions-action@v1 uses: marocchino/tool-versions-action@v1
id: versions id: versions
- uses: erlef/setup-beam@v1 - name: Set up Elixir
uses: erlef/setup-beam@v1
with: with:
elixir-version: ${{ steps.versions.outputs.elixir }} elixir-version: ${{steps.versions.outputs.elixir}}
otp-version: ${{ steps.versions.outputs.erlang }} otp-version: ${{ steps.versions.outputs.erlang}}
- name: Restore dependencies cache
- uses: actions/cache@v4 uses: buildjet/cache@v4
with: with:
path: | path: |
deps deps
_build _build
priv/plts priv/plts
key: static-${{ env.MIX_ENV }}-${{ env.CACHE_VERSION }}-${{ github.head_ref || github.ref }}-${{ hashFiles('**/mix.lock') }} key: ${{ runner.os }}-mix-v7-${{ hashFiles('**/mix.lock') }}
restore-keys: | restore-keys: ${{ runner.os }}-mix-v7-
static-${{ env.MIX_ENV }}-${{ env.CACHE_VERSION }}-${{ github.head_ref || github.ref }}- - name: Install dependencies
static-${{ env.MIX_ENV }}-${{ env.CACHE_VERSION }}-refs/heads/master- run: mix deps.get && npm install --prefix ./tracker
- name: Check Formatting
- run: mix deps.get run: mix format --check-formatted
- run: mix compile --warnings-as-errors --all-warnings - name: Check Compile Warnings
- run: mix format --check-formatted run: mix compile --warnings-as-errors --all-warnings
- run: mix deps.unlock --check-unused - name: Generate tracker files
- run: mix credo diff --from-git-merge-base origin/master run: npm run deploy --prefix ./tracker
- run: mix dialyzer - name: Check Credo Warnings
run: mix credo diff --from-git-merge-base origin/master
- name: Run tests
run: mix test --include slow --include minio --max-failures 1 --warnings-as-errors
- name: Run tests (small build)
run: MIX_ENV=small_test mix test --include slow --max-failures 1 --warnings-as-errors
- name: Check Dialyzer
run: mix dialyzer
env:
MIX_ENV: test

@ -1,28 +0,0 @@
name: Validate migrations
on:
pull_request:
paths:
- 'priv/repo/migrations/**'
- 'priv/ingest_repo/migrations/**'
jobs:
validate:
name: App code does not change at the same time
runs-on: ubuntu-latest
steps:
- uses: dorny/paths-filter@v3
id: changes
with:
list-files: json
filters: |
lib:
- 'lib/**'
- 'extra/**'
- 'config/**'
- if: steps.changes.outputs.lib == 'true'
run: |
echo "::error file=${{ fromJSON(steps.changes.outputs.lib_files)[0] }}::Code and migrations shouldn't be changed at the same time"
exit 1

@ -2,11 +2,6 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
### Added ### Added
- Pages Block List in Site Settings
- Add `conversion_rate` to Stats API Timeseries and on the main graph
- Add `total_conversions` and `conversion_rate` to `visitors.csv` in a goal-filtered CSV export
- Ability to display total conversions (with a goal filter) on the main graph
- Add `conversion_rate` to Stats API Timeseries and on the main graph
- Add `time_on_page` metric into the Stats API - Add `time_on_page` metric into the Stats API
- County Block List in Site Settings - County Block List in Site Settings
- Query the `views_per_visit` metric based on imported data as well if possible - Query the `views_per_visit` metric based on imported data as well if possible
@ -36,19 +31,14 @@ All notable changes to this project will be documented in this file.
- Add 'browser_versions.csv' to CSV export - Add 'browser_versions.csv' to CSV export
- Add `CLICKHOUSE_MAX_BUFFER_SIZE_BYTES` env var which defaults to `100000` (100KB) - Add `CLICKHOUSE_MAX_BUFFER_SIZE_BYTES` env var which defaults to `100000` (100KB)
- Add alternative SMTP adapter plausible/analytics#3654 - Add alternative SMTP adapter plausible/analytics#3654
- Add `EXTRA_CONFIG_PATH` env var to specify extra Elixir config plausible/analytics#3906
- Add restrictive `robots.txt` for self-hosted plausible/analytics#3905
### Removed ### Removed
- Removed the nested custom event property breakdown UI when filtering by a goal in Goal Conversions - Removed the nested custom event property breakdown UI when filtering by a goal in Goal Conversions
- Removed the `prop_names` returned in the Stats API `event:goal` breakdown response - Removed the `prop_names` returned in the Stats API `event:goal` breakdown response
- Removed the `prop-breakdown.csv` file from CSV export - Removed the `prop-breakdown.csv` file from CSV export
- Deprecated `CLICKHOUSE_MAX_BUFFER_SIZE` - Deprecated `CLICKHOUSE_MAX_BUFFER_SIZE`
- Removed `/app/init-admin.sh` that was deprecated in v2.0.0 plausible/analytics#3903
- Remove `DISABLE_AUTH` deprecation warning plausible/analytics#3904
### Changed ### Changed
- A visits `entry_page` and `exit_page` is only set and updated for pageviews, not custom events
- Limit the number of Goal Conversions shown on the dashboard and render a "Details" link when there are more entries to show - Limit the number of Goal Conversions shown on the dashboard and render a "Details" link when there are more entries to show
- Show Outbound Links / File Downloads / 404 Pages / Cloaked Links instead of Goal Conversions when filtering by the corresponding goal - Show Outbound Links / File Downloads / 404 Pages / Cloaked Links instead of Goal Conversions when filtering by the corresponding goal
- Require custom properties to be explicitly added from Site Settings > Custom Properties in order for them to show up on the dashboard - Require custom properties to be explicitly added from Site Settings > Custom Properties in order for them to show up on the dashboard
@ -57,8 +47,6 @@ All notable changes to this project will be documented in this file.
- Validate metric isn't queried multiple times - Validate metric isn't queried multiple times
### Fixed ### Fixed
- Creating many sites no longer leads to cookie overflow
- Ignore sessions without pageviews for `entry_page` and `exit_page` breakdowns
- Using `VersionedCollapsingMergeTree` to store visit data to avoid rare race conditions that led to wrong visit data being shown - Using `VersionedCollapsingMergeTree` to store visit data to avoid rare race conditions that led to wrong visit data being shown
- Fix `conversion_rate` metric in a `browser_versions` breakdown - Fix `conversion_rate` metric in a `browser_versions` breakdown
- Calculate `conversion_rate` percentage change in the same way like `bounce_rate` (subtraction instead of division) - Calculate `conversion_rate` percentage change in the same way like `bounce_rate` (subtraction instead of division)
@ -77,10 +65,7 @@ All notable changes to this project will be documented in this file.
- Allow custom event timeseries in stats API plausible/analytics#3505 - Allow custom event timeseries in stats API plausible/analytics#3505
- Fixes for sites with UTF characters in domain plausible/analytics#3560 - Fixes for sites with UTF characters in domain plausible/analytics#3560
- Fix crash when using special characters in filter plausible/analytics#3634 - Fix crash when using special characters in filter plausible/analytics#3634
- Fix automatic scrolling to the bottom on the dashboard if previously selected properties tab plausible/analytics#3872
- Allow running the container with arbitrary UID plausible/analytics#2986 - Allow running the container with arbitrary UID plausible/analytics#2986
- Fix `width=manual` in embedded dashboards plausible/analytics#3910
- Fix URL escaping when pipes are used in UTM tags plausible/analytics#3930
## v2.0.0 - 2023-07-12 ## v2.0.0 - 2023-07-12

@ -47,7 +47,8 @@ RUN npm run deploy --prefix ./tracker && \
mix assets.deploy && \ mix assets.deploy && \
mix phx.digest priv/static && \ mix phx.digest priv/static && \
mix download_country_database && \ mix download_country_database && \
mix sentry.package_source_code # https://hexdocs.pm/sentry/Sentry.Sources.html#module-source-code-storage
mix sentry_recompile
WORKDIR /app WORKDIR /app
COPY rel rel COPY rel rel

@ -38,10 +38,7 @@ postgres-stop: ## Stop and remove the postgres container
docker stop plausible_db && docker rm plausible_db docker stop plausible_db && docker rm plausible_db
minio: ## Start a transient container with a recent version of minio (s3) minio: ## Start a transient container with a recent version of minio (s3)
docker run -d --rm -p 10000:10000 -p 10001:10001 --name plausible_minio minio/minio server /data --address ":10000" --console-address ":10001" docker run -d --rm -p 6000:6000 -p 6001:6001 --name plausible_minio minio/minio server /data --address ":6000" --console-address ":6001"
while ! docker exec plausible_minio mc alias set local http://localhost:10000 minioadmin minioadmin; do sleep 1; done
docker exec plausible_minio mc mb local/dev-exports
docker exec plausible_minio mc mb local/dev-imports
minio-stop: ## Stop and remove the minio container minio-stop: ## Stop and remove the minio container
docker stop plausible_minio docker stop plausible_minio

@ -22,7 +22,6 @@ if (container) {
conversionsOptedOut: container.dataset.conversionsOptedOut === 'true', conversionsOptedOut: container.dataset.conversionsOptedOut === 'true',
funnelsOptedOut: container.dataset.funnelsOptedOut === 'true', funnelsOptedOut: container.dataset.funnelsOptedOut === 'true',
propsOptedOut: container.dataset.propsOptedOut === 'true', propsOptedOut: container.dataset.propsOptedOut === 'true',
revenueGoals: JSON.parse(container.dataset.revenueGoals),
funnels: JSON.parse(container.dataset.funnels), funnels: JSON.parse(container.dataset.funnels),
statsBegin: container.dataset.statsBegin, statsBegin: container.dataset.statsBegin,
nativeStatsBegin: container.dataset.nativeStatsBegin, nativeStatsBegin: container.dataset.nativeStatsBegin,

@ -159,10 +159,10 @@ export default function PlausibleCombobox(props) {
}, []) }, [])
useEffect(() => { useEffect(() => {
if (props.singleOption && props.values.length === 0 && props.autoFocus) { if (props.singleOption && props.values.length === 0) {
searchRef.current.focus() searchRef.current.focus()
} }
}, [props.values.length === 0, props.singleOption, props.autoFocus]) }, [props.values.length === 0])
const searchBoxClass = 'border-none py-1 px-0 w-full inline-block rounded-md focus:outline-none focus:ring-0 text-sm' const searchBoxClass = 'border-none py-1 px-0 w-full inline-block rounded-md focus:outline-none focus:ring-0 text-sm'

@ -258,10 +258,6 @@ class Filters extends React.Component {
) )
} }
trackFilterMenu() {
window.plausible && window.plausible('Filter Menu: Open', {u: `${window.location.protocol}//${window.location.hostname}/:dashboard`})
}
renderDropDown() { renderDropDown() {
const { history, query, site } = this.props; const { history, query, site } = this.props;
@ -270,7 +266,7 @@ class Filters extends React.Component {
{({ open }) => ( {({ open }) => (
<> <>
<div> <div>
<Menu.Button onClick={this.trackFilterMenu} className="flex items-center text-xs md:text-sm font-medium leading-tight px-3 py-2 cursor-pointer ml-auto text-gray-500 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900 rounded"> <Menu.Button className="flex items-center text-xs md:text-sm font-medium leading-tight px-3 py-2 cursor-pointer ml-auto text-gray-500 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900 rounded">
{this.renderDropdownButton()} {this.renderDropdownButton()}
</Menu.Button> </Menu.Button>
</div> </div>

@ -59,7 +59,6 @@ export function parseQuery(querystring, site) {
'region': q.get('region'), 'region': q.get('region'),
'city': q.get('city'), 'city': q.get('city'),
'page': q.get('page'), 'page': q.get('page'),
'hostname': q.get('hostname'),
'entry_page': q.get('entry_page'), 'entry_page': q.get('entry_page'),
'exit_page': q.get('exit_page') 'exit_page': q.get('exit_page')
} }

@ -1,53 +1,27 @@
import numberFormatter, {durationFormatter} from '../../util/number-formatter' import numberFormatter, {durationFormatter} from '../../util/number-formatter'
import { parsePrefix } from '../../util/filters'
export function getGraphableMetrics(query, site) { export const METRIC_MAPPING = {
const isRealtime = query.period === 'realtime' 'Unique visitors (last 30 min)': 'visitors',
const goalFilter = query.filters.goal 'Pageviews (last 30 min)': 'pageviews',
const pageFilter = query.filters.page 'Unique visitors': 'visitors',
'Visit duration': 'visit_duration',
if (isRealtime && goalFilter) { 'Total pageviews': 'pageviews',
return ["visitors"] 'Views per visit': 'views_per_visit',
} else if (isRealtime) { 'Total visits': 'visits',
return ["visitors", "pageviews"] 'Bounce rate': 'bounce_rate',
} else if (goalFilter && canGraphRevenueMetrics(goalFilter, site)) { 'Unique conversions': 'conversions',
return ["visitors", "events", "average_revenue", "total_revenue", "conversion_rate"] 'Average revenue': 'average_revenue',
} else if (goalFilter) { 'Total revenue': 'total_revenue',
return ["visitors", "events", "conversion_rate"]
} else if (pageFilter) {
return ["visitors", "visits", "pageviews", "bounce_rate", "time_on_page"]
} else {
return ["visitors", "visits", "pageviews", "views_per_visit", "bounce_rate", "visit_duration"]
}
}
// Revenue metrics can only be graphed if:
// * The query is filtered by at least one revenue goal
// * All revenue goals in filter have the same currency
function canGraphRevenueMetrics(goalFilter, site) {
const goalsInFilter = parsePrefix(goalFilter).values
const revenueGoalsInFilter = site.revenueGoals.filter((rg) => {
return goalsInFilter.includes(rg.event_name)
})
const singleCurrency = revenueGoalsInFilter.every((rg) => {
return rg.currency === revenueGoalsInFilter[0].currency
})
return revenueGoalsInFilter.length > 0 && singleCurrency
} }
export const METRIC_LABELS = { export const METRIC_LABELS = {
'visitors': 'Visitors', 'visitors': 'Visitors',
'pageviews': 'Pageviews', 'pageviews': 'Pageviews',
'events': 'Total Conversions',
'views_per_visit': 'Views per Visit', 'views_per_visit': 'Views per Visit',
'visits': 'Visits', 'visits': 'Visits',
'bounce_rate': 'Bounce Rate', 'bounce_rate': 'Bounce Rate',
'visit_duration': 'Visit Duration', 'visit_duration': 'Visit Duration',
'conversions': 'Converted Visitors', 'conversions': 'Converted Visitors',
'conversion_rate': 'Conversion Rate',
'average_revenue': 'Average Revenue', 'average_revenue': 'Average Revenue',
'total_revenue': 'Total Revenue', 'total_revenue': 'Total Revenue',
} }
@ -55,17 +29,23 @@ export const METRIC_LABELS = {
export const METRIC_FORMATTER = { export const METRIC_FORMATTER = {
'visitors': numberFormatter, 'visitors': numberFormatter,
'pageviews': numberFormatter, 'pageviews': numberFormatter,
'events': numberFormatter,
'visits': numberFormatter, 'visits': numberFormatter,
'views_per_visit': (number) => (number), 'views_per_visit': (number) => (number),
'bounce_rate': (number) => (`${number}%`), 'bounce_rate': (number) => (`${number}%`),
'visit_duration': durationFormatter, 'visit_duration': durationFormatter,
'conversions': numberFormatter, 'conversions': numberFormatter,
'conversion_rate': (number) => (`${number}%`),
'total_revenue': numberFormatter, 'total_revenue': numberFormatter,
'average_revenue': numberFormatter, 'average_revenue': numberFormatter,
} }
export const LoadingState = {
loading: 'loading',
refreshing: 'refreshing',
loaded: 'loaded',
isLoadingOrRefreshing: function (state) { return [this.loading, this.refreshing].includes(state) },
isLoadedOrRefreshing: function (state) { return [this.loaded, this.refreshing].includes(state) }
}
const buildComparisonDataset = function(comparisonPlot) { const buildComparisonDataset = function(comparisonPlot) {
if (!comparisonPlot) return [] if (!comparisonPlot) return []

@ -6,7 +6,7 @@ import * as storage from '../../util/storage'
import { isKeyPressed } from '../../keybinding.js' import { isKeyPressed } from '../../keybinding.js'
import { monthsBetweenDates } from '../../util/date.js' import { monthsBetweenDates } from '../../util/date.js'
const INTERVAL_LABELS = { export const INTERVAL_LABELS = {
'minute': 'Minutes', 'minute': 'Minutes',
'hour': 'Hours', 'hour': 'Hours',
'date': 'Days', 'date': 'Days',
@ -14,19 +14,11 @@ const INTERVAL_LABELS = {
'month': 'Months' 'month': 'Months'
} }
function validIntervals(site, query) { export const getStoredInterval = function(period, domain) {
if (query.period === "custom" && monthsBetweenDates(query.from, query.to) > 12) {
return ["week", "month"]
} else {
return site.validIntervalsByPeriod[query.period]
}
}
function getStoredInterval(period, domain) {
return storage.getItem(`interval__${period}__${domain}`) return storage.getItem(`interval__${period}__${domain}`)
} }
function storeInterval(period, domain, interval) { export const storeInterval = function(period, domain, interval) {
storage.setItem(`interval__${period}__${domain}`, interval) storage.setItem(`interval__${period}__${domain}`, interval)
} }
@ -41,47 +33,37 @@ function subscribeKeybinding(element) {
}, [handleKeyPress]) }, [handleKeyPress])
} }
export const getCurrentInterval = function(site, query) { function DropdownItem({ option, currentInterval, updateInterval }) {
const options = validIntervals(site, query) return (
<Menu.Item onClick={() => updateInterval(option)} key={option} disabled={option == currentInterval}>
const storedInterval = getStoredInterval(query.period, site.domain) {({ active }) => (
const defaultInterval = [...options].pop() <span className={classNames({
'bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-200 cursor-pointer': active,
if (storedInterval && options.includes(storedInterval)) { 'text-gray-700 dark:text-gray-200': !active,
return storedInterval 'font-bold cursor-none select-none': option == currentInterval,
} else { }, 'block px-4 py-2 text-sm')}>
return defaultInterval {INTERVAL_LABELS[option]}
} </span>
)}
</Menu.Item>
)
} }
export function IntervalPicker({ query, site, onIntervalUpdate }) { export function IntervalPicker({ graphData, query, site, updateInterval }) {
if (query.period == 'realtime') return null if (query.period == 'realtime') return null
const menuElement = React.useRef(null)
const options = validIntervals(site, query)
const currentInterval = getCurrentInterval(site, query)
const menuElement = React.useRef(null)
subscribeKeybinding(menuElement) subscribeKeybinding(menuElement)
function updateInterval(interval) { let currentInterval = graphData?.interval
storeInterval(query.period, site.domain, interval)
onIntervalUpdate(interval) let options = site.validIntervalsByPeriod[query.period]
if (query.period === "custom" && monthsBetweenDates(query.from, query.to) > 12) {
options = ["week", "month"]
} }
function renderDropdownItem(option) { if (!options.includes(currentInterval)) {
return ( currentInterval = [...options].pop()
<Menu.Item onClick={() => updateInterval(option)} key={option} disabled={option == currentInterval}>
{({ active }) => (
<span className={classNames({
'bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-200 cursor-pointer': active,
'text-gray-700 dark:text-gray-200': !active,
'font-bold cursor-none select-none': option == currentInterval,
}, 'block px-4 py-2 text-sm')}>
{INTERVAL_LABELS[option]}
</span>
)}
</Menu.Item>
)
} }
return ( return (
@ -103,7 +85,7 @@ export function IntervalPicker({ query, site, onIntervalUpdate }) {
leaveFrom="opacity-100 scale-100" leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"> leaveTo="opacity-0 scale-95">
<Menu.Items className="py-1 text-left origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none z-10" static> <Menu.Items className="py-1 text-left origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none z-10" static>
{options.map(renderDropdownItem)} {options.map((option) => DropdownItem({ option, currentInterval, updateInterval }))}
</Menu.Items> </Menu.Items>
</Transition> </Transition>
</> </>

@ -1,247 +0,0 @@
import React from 'react';
import { withRouter } from 'react-router-dom'
import Chart from 'chart.js/auto';
import { navigateToQuery } from '../../query'
import GraphTooltip from './graph-tooltip'
import { buildDataSet, METRIC_LABELS, METRIC_FORMATTER } from './graph-util'
import dateFormatter from './date-formatter';
import FadeIn from '../../fade-in';
import classNames from 'classnames';
const calculateMaximumY = function(dataset) {
const yAxisValues = dataset
.flatMap((item) => item.data)
.map((item) => item || 0)
if (yAxisValues) {
return Math.max(...yAxisValues)
} else {
return 1
}
}
class LineGraph extends React.Component {
constructor(props) {
super(props);
this.regenerateChart = this.regenerateChart.bind(this);
this.updateWindowDimensions = this.updateWindowDimensions.bind(this);
}
getGraphMetric() {
let metric = this.props.graphData.metric
if (metric == 'visitors' && this.props.query.filters.goal) {
return 'conversions'
} else {
return metric
}
}
regenerateChart() {
const { graphData, query } = this.props
const metric = this.getGraphMetric()
const graphEl = document.getElementById("main-graph-canvas")
this.ctx = graphEl.getContext('2d');
const dataSet = buildDataSet(graphData.plot, graphData.comparison_plot, graphData.present_index, this.ctx, METRIC_LABELS[metric])
return new Chart(this.ctx, {
type: 'line',
data: {
labels: graphData.labels,
datasets: dataSet
},
options: {
animation: false,
plugins: {
legend: { display: false },
tooltip: {
enabled: false,
mode: 'index',
intersect: false,
position: 'average',
external: GraphTooltip(graphData, metric, query)
},
},
responsive: true,
maintainAspectRatio: false,
onResize: this.updateWindowDimensions,
elements: { line: { tension: 0 }, point: { radius: 0 } },
onClick: this.maybeHopToHoveredPeriod.bind(this),
scale: {
ticks: { precision: 0, maxTicksLimit: 8 }
},
scales: {
y: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
ticks: {
callback: METRIC_FORMATTER[metric],
color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
},
grid: {
zeroLineColor: 'transparent',
drawBorder: false,
}
},
yComparison: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
display: false,
grid: { display: false },
},
x: {
grid: { display: false },
ticks: {
callback: function(val, _index, _ticks) {
if (this.getLabelForValue(val) == "__blank__") return ""
const hasMultipleYears =
graphData.labels
.filter((date) => typeof date === 'string')
.map(date => date.split('-')[0])
.filter((value, index, list) => list.indexOf(value) === index)
.length > 1
if (graphData.interval === 'hour' && query.period !== 'day') {
const date = dateFormatter({
interval: "date",
longForm: false,
period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
const hour = dateFormatter({
interval: graphData.interval,
longForm: false,
period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
// Returns a combination of date and hour. This is because
// small intervals like hour may return multiple days
// depending on the query period.
return `${date}, ${hour}`
}
if (graphData.interval === 'minute' && query.period !== 'realtime') {
return dateFormatter({
interval: "hour", longForm: false, period: query.period,
})(this.getLabelForValue(val))
}
return dateFormatter({
interval: graphData.interval, longForm: false, period: query.period, shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
},
color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
}
}
},
interaction: {
mode: 'index',
intersect: false,
}
}
});
}
repositionTooltip(e) {
const tooltipEl = document.getElementById('chartjs-tooltip');
if (tooltipEl && window.innerWidth >= 768) {
if (e.clientX > 0.66 * window.innerWidth) {
tooltipEl.style.right = (window.innerWidth - e.clientX) + window.pageXOffset + 'px'
tooltipEl.style.left = null;
} else {
tooltipEl.style.right = null;
tooltipEl.style.left = e.clientX + window.pageXOffset + 'px'
}
tooltipEl.style.top = e.clientY + window.pageYOffset + 'px'
tooltipEl.style.opacity = 1;
}
}
componentDidMount() {
if (this.props.graphData) {
this.chart = this.regenerateChart();
}
window.addEventListener('mousemove', this.repositionTooltip);
}
componentDidUpdate(prevProps) {
const { graphData, darkTheme } = this.props;
const tooltip = document.getElementById('chartjs-tooltip');
if (
graphData !== prevProps.graphData ||
darkTheme !== prevProps.darkTheme
) {
if (graphData) {
if (this.chart) {
this.chart.destroy();
}
this.chart = this.regenerateChart();
this.chart.update();
}
if (tooltip) {
tooltip.style.display = 'none';
}
}
if (!graphData) {
if (this.chart) {
this.chart.destroy();
}
if (tooltip) {
tooltip.style.display = 'none';
}
}
}
componentWillUnmount() {
// Ensure that the tooltip doesn't hang around when we are loading more data
const tooltip = document.getElementById('chartjs-tooltip');
if (tooltip) {
tooltip.style.opacity = 0;
tooltip.style.display = 'none';
}
window.removeEventListener('mousemove', this.repositionTooltip)
}
/**
* The current ticks' limits are set to treat iPad (regular/Mini/Pro) as a regular screen.
* @param {*} chart - The chart instance.
* @param {*} dimensions - An object containing the new dimensions *of the chart.*
*/
updateWindowDimensions(chart, dimensions) {
chart.options.scales.x.ticks.maxTicksLimit = dimensions.width < 720 ? 5 : 8
}
maybeHopToHoveredPeriod(e) {
const element = this.chart.getElementsAtEventForMode(e, 'index', { intersect: false })[0]
const date = this.props.graphData.labels[element.index] || this.props.graphData.comparison_labels[element.index]
if (this.props.graphData.interval === 'month') {
navigateToQuery(this.props.history, this.props.query, { period: 'month', date })
} else if (this.props.graphData.interval === 'date') {
navigateToQuery(this.props.history, this.props.query, { period: 'day', date })
}
}
render() {
const { graphData } = this.props
const canvasClass = classNames('mt-4 select-none', { 'cursor-pointer': !['minute', 'hour'].includes(graphData?.interval) })
return (
<FadeIn show={graphData}>
<div className="relative h-96 print:h-auto print:pb-8 w-full z-0">
<canvas id="main-graph-canvas" className={canvasClass}></canvas>
</div>
</FadeIn>
)
}
}
export default withRouter(LineGraph)

@ -1,17 +0,0 @@
import React from "react"
export default function SamplingNotice({topStatData}) {
const samplePercent = topStatData?.samplePercent
if (samplePercent && samplePercent < 100) {
return (
<div tooltip={`Stats based on a ${samplePercent}% sample of all visitors`} className="cursor-pointer w-4 h-4 mx-2">
<svg className="absolute w-4 h-4 dark:text-gray-300 text-gray-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
)
} else {
return null
}
}

@ -1,53 +0,0 @@
import React, { useState } from "react"
import * as api from '../../api'
import { getCurrentInterval } from "./interval-picker"
export default function StatsExport({site, query}) {
const [exporting, setExporting] = useState(false)
function startExport() {
setExporting(true)
document.cookie = "exporting="
pollExportReady()
}
function pollExportReady() {
if (document.cookie.includes('exporting')) {
setTimeout(pollExportReady, 1000)
} else {
setExporting(false)
}
}
function renderLoading() {
return (
<svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
)
}
function renderExportLink() {
const interval = getCurrentInterval(site, query)
const queryParams = api.serializeQuery(query, [{ interval }])
const endpoint = `/${encodeURIComponent(site.domain)}/export${queryParams}`
return (
<a href={endpoint} download onClick={startExport}>
<svg className="absolute text-gray-700 feather dark:text-gray-300 hover:text-indigo-600 dark:hover:text-indigo-600" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path>
<polyline points="7 10 12 15 17 10"></polyline>
<line x1="12" y1="15" x2="12" y2="3"></line>
</svg>
</a>
)
}
return (
<div className="w-4 h-4 mx-2">
{exporting && renderLoading()}
{!exporting && renderExportLink()}
</div>
)
}

@ -3,9 +3,8 @@ import { Tooltip } from '../../util/tooltip'
import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load' import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load'
import classNames from "classnames"; import classNames from "classnames";
import numberFormatter, { durationFormatter } from '../../util/number-formatter' import numberFormatter, { durationFormatter } from '../../util/number-formatter'
import * as storage from '../../util/storage' import { METRIC_MAPPING } from './graph-util'
import { formatDateRange } from '../../util/date.js' import { formatDateRange } from '../../util/date.js'
import { getGraphableMetrics } from "./graph-util.js";
function Maybe({condition, children}) { function Maybe({condition, children}) {
if (condition) { if (condition) {
@ -15,103 +14,99 @@ function Maybe({condition, children}) {
} }
} }
function renderPercentageComparison(name, comparison, forceDarkBg = false) { export default class TopStats extends React.Component {
const formattedComparison = numberFormatter(Math.abs(comparison)) renderPercentageComparison(name, comparison, forceDarkBg = false) {
const formattedComparison = numberFormatter(Math.abs(comparison))
const defaultClassName = classNames({
"pl-2 text-xs dark:text-gray-100": !forceDarkBg, const defaultClassName = classNames({
"pl-2 text-xs text-gray-100": forceDarkBg "pl-2 text-xs dark:text-gray-100": !forceDarkBg,
}) "pl-2 text-xs text-gray-100": forceDarkBg
})
const noChangeClassName = classNames({
"pl-2 text-xs text-gray-700 dark:text-gray-300": !forceDarkBg, const noChangeClassName = classNames({
"pl-2 text-xs text-gray-300": forceDarkBg "pl-2 text-xs text-gray-700 dark:text-gray-300": !forceDarkBg,
}) "pl-2 text-xs text-gray-300": forceDarkBg
})
if (comparison > 0) {
const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500' if (comparison > 0) {
return <span className={defaultClassName}><span className={color + ' font-bold'}>&uarr;</span> {formattedComparison}%</span> const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500'
} else if (comparison < 0) { return <span className={defaultClassName}><span className={color + ' font-bold'}>&uarr;</span> {formattedComparison}%</span>
const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400' } else if (comparison < 0) {
return <span className={defaultClassName}><span className={color + ' font-bold'}>&darr;</span> {formattedComparison}%</span> const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400'
} else if (comparison === 0) { return <span className={defaultClassName}><span className={color + ' font-bold'}>&darr;</span> {formattedComparison}%</span>
return <span className={noChangeClassName}>&#12336; 0%</span> } else if (comparison === 0) {
} else { return <span className={noChangeClassName}>&#12336; 0%</span>
return null } else {
return null
}
} }
}
function topStatNumberShort(name, value) { topStatNumberShort(name, value) {
if (['visit duration', 'time on page'].includes(name.toLowerCase())) { if (['visit duration', 'time on page'].includes(name.toLowerCase())) {
return durationFormatter(value) return durationFormatter(value)
} else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {
return value + '%' return value + '%'
} else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) { } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) {
return value?.short return value?.short
} else { } else {
return numberFormatter(value) return numberFormatter(value)
}
} }
}
function topStatNumberLong(name, value) { topStatNumberLong(name, value) {
if (['visit duration', 'time on page'].includes(name.toLowerCase())) { if (['visit duration', 'time on page'].includes(name.toLowerCase())) {
return durationFormatter(value) return durationFormatter(value)
} else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) { } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {
return value + '%' return value + '%'
} else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) { } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) {
return value?.long return value?.long
} else { } else {
return (value || 0).toLocaleString() return (value || 0).toLocaleString()
}
} }
}
export default function TopStats(props) {
const {site, query, data, onMetricUpdate, tooltipBoundary, lastLoadTimestamp} = props
function tooltip(stat) { topStatTooltip(stat, query) {
let statName = stat.name.toLowerCase() let statName = stat.name.toLowerCase()
statName = stat.value === 1 ? statName.slice(0, -1) : statName statName = stat.value === 1 ? statName.slice(0, -1) : statName
return ( return (
<div> <div>
{query.comparison && <div className="whitespace-nowrap"> {query.comparison && <div className="whitespace-nowrap">
{topStatNumberLong(stat.name, stat.value)} vs. {topStatNumberLong(stat.name, stat.comparison_value)} {statName} {this.topStatNumberLong(stat.name, stat.value)} vs. {this.topStatNumberLong(stat.name, stat.comparison_value)} {statName}
<span className="ml-2">{renderPercentageComparison(stat.name, stat.change, true)}</span> <span className="ml-2">{this.renderPercentageComparison(stat.name, stat.change, true)}</span>
</div>} </div>}
{!query.comparison && <div className="whitespace-nowrap"> {!query.comparison && <div className="whitespace-nowrap">
{topStatNumberLong(stat.name, stat.value)} {statName} {this.topStatNumberLong(stat.name, stat.value)} {statName}
</div>} </div>}
{stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp}/>s ago</p>} {stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={this.props.lastLoadTimestamp}/>s ago</p>}
</div> </div>
) )
} }
function canMetricBeGraphed(stat) { canMetricBeGraphed(stat) {
const graphableMetrics = getGraphableMetrics(query, site) const isTotalUniqueVisitors = this.props.query.filters.goal && stat.name === 'Unique visitors'
return stat.graph_metric && graphableMetrics.includes(stat.graph_metric) const isKnownMetric = Object.keys(METRIC_MAPPING).includes(stat.name)
return isKnownMetric && !isTotalUniqueVisitors
} }
function maybeUpdateMetric(stat) { maybeUpdateMetric(stat) {
if (canMetricBeGraphed(stat)) { if (this.canMetricBeGraphed(stat)) {
storage.setItem(`metric__${site.domain}`, stat.graph_metric) this.props.updateMetric(METRIC_MAPPING[stat.name])
onMetricUpdate(stat.graph_metric)
} }
} }
function blinkingDot() { blinkingDot() {
return ( return (
<div key="dot" className="block pulsating-circle" style={{ left: '125px', top: '52px' }}></div> <div key="dot" className="block pulsating-circle" style={{ left: '125px', top: '52px' }}></div>
) )
} }
function getStoredMetric() { renderStatName(stat) {
return storage.getItem(`metric__${site.domain}`) const { metric } = this.props
} const isSelected = metric === METRIC_MAPPING[stat.name]
function renderStatName(stat) {
const isSelected = stat.graph_metric === getStoredMetric()
const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g) const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g)
@ -128,45 +123,48 @@ export default function TopStats(props) {
) )
} }
function renderStat(stat, index) { render() {
const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', { const { topStatData, query, site } = this.props
'cursor-pointer': canMetricBeGraphed(stat),
'lg:border-l border-gray-300': index > 0, const stats = topStatData && topStatData.top_stats.map((stat, index) => {
'border-r lg:border-r-0': index % 2 === 0
}) const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', {
'cursor-pointer': this.canMetricBeGraphed(stat),
'lg:border-l border-gray-300': index > 0,
'border-r lg:border-r-0': index % 2 === 0
})
return (
<Tooltip key={stat.name} info={this.topStatTooltip(stat, query)} className={className} onClick={() => { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}>
{this.renderStatName(stat)}
<div className="my-1 space-y-2">
<div>
<span className="flex items-center justify-between whitespace-nowrap">
<p className="font-bold text-xl dark:text-gray-100" id={METRIC_MAPPING[stat.name]}>{this.topStatNumberShort(stat.name, stat.value)}</p>
<Maybe condition={!query.comparison}>
{ this.renderPercentageComparison(stat.name, stat.change) }
</Maybe>
</span>
<Maybe condition={query.comparison}>
<p className="text-xs dark:text-gray-100">{ formatDateRange(site, topStatData.from, topStatData.to) }</p>
</Maybe>
</div>
return (
<Tooltip key={stat.name} info={tooltip(stat, query)} className={className} onClick={() => { maybeUpdateMetric(stat) }} boundary={tooltipBoundary}>
{renderStatName(stat)}
<div className="my-1 space-y-2">
<div>
<span className="flex items-center justify-between whitespace-nowrap">
<p className="font-bold text-xl dark:text-gray-100" id={stat.graph_metric}>{topStatNumberShort(stat.name, stat.value)}</p>
<Maybe condition={!query.comparison}>
{ renderPercentageComparison(stat.name, stat.change) }
</Maybe>
</span>
<Maybe condition={query.comparison}> <Maybe condition={query.comparison}>
<p className="text-xs dark:text-gray-100">{ formatDateRange(site, data.from, data.to) }</p> <div>
<p className="font-bold text-xl text-gray-500 dark:text-gray-400">{ this.topStatNumberShort(stat.name, stat.comparison_value) }</p>
<p className="text-xs text-gray-500 dark:text-gray-400">{ formatDateRange(site, topStatData.comparing_from, topStatData.comparing_to) }</p>
</div>
</Maybe> </Maybe>
</div>
<Maybe condition={query.comparison}>
<div>
<p className="font-bold text-xl text-gray-500 dark:text-gray-400">{ topStatNumberShort(stat.name, stat.comparison_value) }</p>
<p className="text-xs text-gray-500 dark:text-gray-400">{ formatDateRange(site, data.comparing_from, data.comparing_to) }</p>
</div> </div>
</Maybe> </Tooltip>
</div> )
</Tooltip> })
)
}
const stats = data && data.top_stats.map(renderStat) if (stats && query && query.period === 'realtime') {
stats.push(this.blinkingDot())
}
if (stats && query.period === 'realtime') { return stats || null;
stats.push(blinkingDot())
} }
return stats || null;
} }

@ -1,153 +1,534 @@
import React, { useState, useEffect, useRef, useCallback } from 'react'; import React from 'react';
import { withRouter, Link } from 'react-router-dom'
import Chart from 'chart.js/auto';
import { navigateToQuery } from '../../query'
import * as api from '../../api' import * as api from '../../api'
import * as storage from '../../util/storage' import * as storage from '../../util/storage'
import { getGraphableMetrics } from './graph-util' import LazyLoader from '../../components/lazy-loader'
import GraphTooltip from './graph-tooltip'
import { buildDataSet, METRIC_MAPPING, METRIC_LABELS, METRIC_FORMATTER, LoadingState } from './graph-util'
import dateFormatter from './date-formatter';
import TopStats from './top-stats'; import TopStats from './top-stats';
import { IntervalPicker, getCurrentInterval } from './interval-picker' import { IntervalPicker, getStoredInterval, storeInterval } from './interval-picker';
import StatsExport from './stats-export'
import WithImportedSwitch from './with-imported-switch';
import SamplingNotice from './sampling-notice';
import FadeIn from '../../fade-in'; import FadeIn from '../../fade-in';
import * as url from '../../util/url' import * as url from '../../util/url'
import classNames from 'classnames';
import { monthsBetweenDates, parseNaiveDate, isBefore } from '../../util/date'
import { isComparisonEnabled } from '../../comparison-input' import { isComparisonEnabled } from '../../comparison-input'
import LineGraphWithRouter from './line-graph'
function fetchTopStats(site, query) { const calculateMaximumY = function(dataset) {
const q = { ...query } const yAxisValues = dataset
.flatMap((item) => item.data)
if (!isComparisonEnabled(q.comparison)) { .map((item) => item || 0)
q.comparison = 'previous_period'
}
return api.get(url.apiPath(site, '/top-stats'), q) if (yAxisValues) {
return Math.max(...yAxisValues)
} else {
return 1
}
} }
function fetchMainGraph(site, query, metric, interval) { class LineGraph extends React.Component {
const params = {metric, interval} constructor(props) {
return api.get(url.apiPath(site, '/main-graph'), query, params) super(props);
} this.boundary = React.createRef()
this.regenerateChart = this.regenerateChart.bind(this);
this.updateWindowDimensions = this.updateWindowDimensions.bind(this);
this.state = {
exported: false
};
}
export default function VisitorGraph(props) { regenerateChart() {
const {site, query, lastLoadTimestamp} = props const { graphData, metric, query } = this.props
const isRealtime = query.period === 'realtime' const graphEl = document.getElementById("main-graph-canvas")
const isDarkTheme = document.querySelector('html').classList.contains('dark') || false this.ctx = graphEl.getContext('2d');
const dataSet = buildDataSet(graphData.plot, graphData.comparison_plot, graphData.present_index, this.ctx, METRIC_LABELS[metric])
const topStatsBoundary = useRef(null) return new Chart(this.ctx, {
type: 'line',
data: {
labels: graphData.labels,
datasets: dataSet
},
options: {
animation: false,
plugins: {
legend: { display: false },
tooltip: {
enabled: false,
mode: 'index',
intersect: false,
position: 'average',
external: GraphTooltip(graphData, metric, query)
},
},
responsive: true,
maintainAspectRatio: false,
onResize: this.updateWindowDimensions,
elements: { line: { tension: 0 }, point: { radius: 0 } },
onClick: this.onClick.bind(this),
scale: {
ticks: { precision: 0, maxTicksLimit: 8 }
},
scales: {
y: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
ticks: {
callback: METRIC_FORMATTER[metric],
color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
},
grid: {
zeroLineColor: 'transparent',
drawBorder: false,
}
},
yComparison: {
min: 0,
suggestedMax: calculateMaximumY(dataSet),
display: false,
grid: { display: false },
},
x: {
grid: { display: false },
ticks: {
callback: function(val, _index, _ticks) {
if (this.getLabelForValue(val) == "__blank__") return ""
const [topStatData, setTopStatData] = useState(null) const hasMultipleYears =
const [topStatsLoading, setTopStatsLoading] = useState(true) graphData.labels
const [graphData, setGraphData] = useState(null) .filter((date) => typeof date === 'string')
const [graphLoading, setGraphLoading] = useState(true) .map(date => date.split('-')[0])
.filter((value, index, list) => list.indexOf(value) === index)
.length > 1
// This state is explicitly meant for the situation where either graph interval if (graphData.interval === 'hour' && query.period !== 'day') {
// or graph metric is changed. That results in behaviour where Top Stats stay const date = dateFormatter({
// intact, but the graph container alone will display a loading spinner for as interval: "date",
// long as new graph data is fetched. longForm: false,
const [graphRefreshing, setGraphRefreshing] = useState(false) period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
const hour = dateFormatter({
interval: graphData.interval,
longForm: false,
period: query.period,
shouldShowYear: hasMultipleYears,
})(this.getLabelForValue(val))
const onIntervalUpdate = useCallback((newInterval) => { // Returns a combination of date and hour. This is because
setGraphData(null) // small intervals like hour may return multiple days
setGraphRefreshing(true) // depending on the query period.
fetchGraphData(getStoredMetric(), newInterval) return `${date}, ${hour}`
}, [query]) }
const onMetricUpdate = useCallback((newMetric) => { if (graphData.interval === 'minute' && query.period !== 'realtime') {
setGraphData(null) return dateFormatter({
setGraphRefreshing(true) interval: "hour", longForm: false, period: query.period,
fetchGraphData(newMetric, getCurrentInterval(site, query)) })(this.getLabelForValue(val))
}, [query]) }
useEffect(() => { return dateFormatter({
setTopStatData(null) interval: graphData.interval, longForm: false, period: query.period, shouldShowYear: hasMultipleYears,
setTopStatsLoading(true) })(this.getLabelForValue(val))
setGraphData(null) },
setGraphLoading(true) color: this.props.darkTheme ? 'rgb(243, 244, 246)' : undefined
fetchTopStatsAndGraphData() }
}
},
interaction: {
mode: 'index',
intersect: false,
}
}
});
}
if (isRealtime) { repositionTooltip(e) {
document.addEventListener('tick', fetchTopStatsAndGraphData) const tooltipEl = document.getElementById('chartjs-tooltip');
if (tooltipEl && window.innerWidth >= 768) {
if (e.clientX > 0.66 * window.innerWidth) {
tooltipEl.style.right = (window.innerWidth - e.clientX) + window.pageXOffset + 'px'
tooltipEl.style.left = null;
} else {
tooltipEl.style.right = null;
tooltipEl.style.left = e.clientX + window.pageXOffset + 'px'
}
tooltipEl.style.top = e.clientY + window.pageYOffset + 'px'
tooltipEl.style.opacity = 1;
} }
}
return () => { componentDidMount() {
document.removeEventListener('tick', fetchTopStatsAndGraphData) if (this.props.graphData) {
this.chart = this.regenerateChart();
} }
}, [query]) window.addEventListener('mousemove', this.repositionTooltip);
}
useEffect(() => { componentDidUpdate(prevProps) {
if (topStatData) { storeTopStatsContainerHeight() } const { graphData, darkTheme } = this.props;
}, [topStatData]) const tooltip = document.getElementById('chartjs-tooltip');
function fetchTopStatsAndGraphData() { if (
fetchTopStats(site, query) graphData !== prevProps.graphData ||
.then((res) => { darkTheme !== prevProps.darkTheme
setTopStatData(res) ) {
setTopStatsLoading(false)
}) if (graphData) {
if (this.chart) {
let metric = getStoredMetric() this.chart.destroy();
const availableMetrics = getGraphableMetrics(query, site) }
this.chart = this.regenerateChart();
if (!availableMetrics.includes(metric)) { this.chart.update();
metric = availableMetrics[0] }
storage.setItem(`metric__${site.domain}`, metric)
if (tooltip) {
tooltip.style.display = 'none';
}
} }
const interval = getCurrentInterval(site, query) if (!graphData) {
if (this.chart) {
this.chart.destroy();
}
fetchGraphData(metric, interval) if (tooltip) {
tooltip.style.display = 'none';
}
}
} }
function fetchGraphData(metric, interval) { componentWillUnmount() {
fetchMainGraph(site, query, metric, interval) // Ensure that the tooltip doesn't hang around when we are loading more data
.then((res) => { const tooltip = document.getElementById('chartjs-tooltip');
setGraphData(res) if (tooltip) {
setGraphLoading(false) tooltip.style.opacity = 0;
setGraphRefreshing(false) tooltip.style.display = 'none';
}) }
window.removeEventListener('mousemove', this.repositionTooltip)
}
/**
* The current ticks' limits are set to treat iPad (regular/Mini/Pro) as a regular screen.
* @param {*} chart - The chart instance.
* @param {*} dimensions - An object containing the new dimensions *of the chart.*
*/
updateWindowDimensions(chart, dimensions) {
chart.options.scales.x.ticks.maxTicksLimit = dimensions.width < 720 ? 5 : 8
}
onClick(e) {
const element = this.chart.getElementsAtEventForMode(e, 'index', { intersect: false })[0]
const date = this.props.graphData.labels[element.index] || this.props.graphData.comparison_labels[element.index]
if (this.props.graphData.interval === 'month') {
navigateToQuery(this.props.history, this.props.query, { period: 'month', date })
} else if (this.props.graphData.interval === 'date') {
navigateToQuery(this.props.history, this.props.query, { period: 'day', date })
}
}
pollExportReady() {
if (document.cookie.includes('exporting')) {
setTimeout(this.pollExportReady.bind(this), 1000);
} else {
this.setState({ exported: false })
}
}
downloadSpinner() {
this.setState({ exported: true });
document.cookie = "exporting=";
setTimeout(this.pollExportReady.bind(this), 1000);
}
downloadLink() {
if (this.props.query.period !== 'realtime') {
if (this.state.exported) {
return (
<div className="w-4 h-4 mx-2">
<svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
</div>
)
} else {
const interval = this.props.graphData?.interval
const queryParams = api.serializeQuery(this.props.query, [{ interval }])
const endpoint = `/${encodeURIComponent(this.props.site.domain)}/export${queryParams}`
return (
<a className="w-4 h-4 mx-2" href={endpoint} download onClick={this.downloadSpinner.bind(this)}>
<svg className="absolute text-gray-700 feather dark:text-gray-300 hover:text-indigo-600 dark:hover:text-indigo-600" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg>
</a>
)
}
}
} }
function getStoredMetric() { samplingNotice() {
return storage.getItem(`metric__${site.domain}`) const samplePercent = this.props.topStatData && this.props.topStatData.sample_percent
if (samplePercent < 100) {
return (
<div tooltip={`Stats based on a ${samplePercent}% sample of all visitors`} className="cursor-pointer w-4 h-4 mx-2">
<svg className="absolute w-4 h-4 dark:text-gray-300 text-gray-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
</div>
)
}
} }
function storeTopStatsContainerHeight() { importedNotice() {
storage.setItem(`topStatsHeight__${site.domain}`, document.getElementById('top-stats-container').clientHeight) if (!this.props.topStatData?.imported_source) return
const isBeforeNativeStats = (date) => {
if (!date) return false
const nativeStatsBegin = parseNaiveDate(this.props.site.nativeStatsBegin)
const parsedDate = parseNaiveDate(date)
return isBefore(parsedDate, nativeStatsBegin, "day")
}
const isQueryingImportedPeriod = isBeforeNativeStats(this.props.topStatData.from)
const isComparingImportedPeriod = isBeforeNativeStats(this.props.topStatData.comparing_from)
if (isQueryingImportedPeriod || isComparingImportedPeriod) {
const source = this.props.topStatData.imported_source
const withImported = this.props.topStatData.with_imported;
const strike = withImported ? "" : " line-through"
const target = url.setQuery('with_imported', !withImported)
const tip = withImported ? "" : "do not ";
return (
<Link to={target} className="w-4 h-4 mx-2">
<div tooltip={`Stats ${tip}include data imported from ${source}.`} className="cursor-pointer w-4 h-4">
<svg className="absolute dark:text-gray-300 text-gray-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<text x="4" y="18" fontSize="24" fill="currentColor" className={"text-gray-700 dark:text-gray-300" + strike}>{source[0].toUpperCase()}</text>
</svg>
</div>
</Link>
)
}
} }
// This function is used for maintaining the main-graph/top-stats container height in the // This function is used for maintaining the main-graph/top-stats container height in the
// loading process. The container height depends on how many top stat metrics are returned // loading process. The container height depends on how many top stat metrics are returned
// from the API, but in the loading state, we don't know that yet. We can use localStorage // from the API, but in the loading state, we don't know that yet. We can use localStorage
// to keep track of the Top Stats container height. // to keep track of the Top Stats container height.
function getTopStatsHeight() { getTopStatsHeight() {
if (topStatData) { if (this.props.topStatData) {
return 'auto' return 'auto'
} else { } else {
return `${storage.getItem(`topStatsHeight__${site.domain}`) || 89}px` return `${storage.getItem(`topStatsHeight__${this.props.site.domain}`) || 89}px`
} }
} }
render() {
const { mainGraphRefreshing, updateMetric, updateInterval, metric, topStatData, query, site, graphData, lastLoadTimestamp } = this.props
const canvasClass = classNames('mt-4 select-none', { 'cursor-pointer': !['minute', 'hour'].includes(graphData?.interval) })
return ( return (
<div className={"relative w-full mt-2 bg-white rounded shadow-xl dark:bg-gray-825"}> <div>
{(topStatsLoading || graphLoading) && renderLoader()} <div id="top-stats-container" className="flex flex-wrap" ref={this.boundary} style={{ height: this.getTopStatsHeight() }}>
<FadeIn show={!(topStatsLoading || graphLoading)}> <TopStats site={site} query={query} metric={metric} updateMetric={updateMetric} topStatData={topStatData} tooltipBoundary={this.boundary.current} lastLoadTimestamp={lastLoadTimestamp} />
<div id="top-stats-container" className="flex flex-wrap" ref={topStatsBoundary} style={{ height: getTopStatsHeight() }}>
<TopStats site={site} query={query} data={topStatData} onMetricUpdate={onMetricUpdate} tooltipBoundary={topStatsBoundary.current} lastLoadTimestamp={lastLoadTimestamp} />
</div> </div>
<div className="relative px-2"> <div className="relative px-2">
{graphRefreshing && renderLoader()} {mainGraphRefreshing && renderLoader()}
<div className="absolute right-4 -top-8 py-1 flex items-center"> <div className="absolute right-4 -top-8 py-1 flex items-center">
{!isRealtime && <StatsExport site={site} query={query} />} {this.downloadLink()}
<SamplingNotice samplePercent={topStatData}/> {this.samplingNotice()}
<WithImportedSwitch site={site} topStatData={topStatData} /> {this.importedNotice()}
<IntervalPicker site={site} query={query} onIntervalUpdate={onIntervalUpdate} /> <IntervalPicker site={site} query={query} graphData={graphData} metric={metric} updateInterval={updateInterval} />
</div> </div>
<LineGraphWithRouter graphData={graphData} darkTheme={isDarkTheme} query={query} /> <FadeIn show={graphData}>
<div className="relative h-96 print:h-auto print:pb-8 w-full z-0">
<canvas id="main-graph-canvas" className={canvasClass}></canvas>
</div>
</FadeIn>
</div> </div>
</div>
)
}
}
const LineGraphWithRouter = withRouter(LineGraph)
export default class VisitorGraph extends React.Component {
constructor(props) {
super(props)
this.state = {
topStatsLoadingState: LoadingState.loading,
mainGraphLoadingState: LoadingState.loading,
metric: storage.getItem(`metric__${this.props.site.domain}`) || 'visitors'
}
this.onVisible = this.onVisible.bind(this)
this.updateMetric = this.updateMetric.bind(this)
this.fetchTopStatData = this.fetchTopStatData.bind(this)
this.fetchGraphData = this.fetchGraphData.bind(this)
this.updateInterval = this.updateInterval.bind(this)
}
isIntervalValid(interval) {
const { query, site } = this.props
const validIntervals = site.validIntervalsByPeriod[query.period] || []
return validIntervals.includes(interval)
}
getIntervalFromStorage() {
const { query, site } = this.props
let interval = getStoredInterval(query.period, site.domain)
if (interval !== "week" && interval !== "month" && query.period === "custom" && monthsBetweenDates(query.from, query.to) > 12) {
interval = "month"
}
if (this.isIntervalValid(interval)) {
return interval
} else {
return null
}
}
updateInterval(interval) {
if (this.isIntervalValid(interval)) {
storeInterval(this.props.query.period, this.props.site.domain, interval)
this.setState({ mainGraphLoadingState: LoadingState.refreshing, graphData: null }, this.fetchGraphData)
}
}
onVisible() {
this.setState({ mainGraphLoadingState: LoadingState.loading }, this.fetchGraphData)
this.fetchTopStatData()
if (this.props.query.period === 'realtime') {
document.addEventListener('tick', this.fetchGraphData)
document.addEventListener('tick', this.fetchTopStatData)
}
}
componentDidUpdate(prevProps, prevState) {
const { metric } = this.state;
const { query } = this.props
if (query !== prevProps.query) {
this.setState({ mainGraphLoadingState: LoadingState.loading, topStatsLoadingState: LoadingState.loading, graphData: null, topStatData: null }, this.fetchGraphData)
this.fetchTopStatData()
}
if (metric !== prevState.metric) {
this.setState({ mainGraphLoadingState: LoadingState.refreshing }, this.fetchGraphData)
}
}
resetMetric() {
const { topStatData } = this.state
const { query, site } = this.props
const savedMetric = storage.getItem(`metric__${site.domain}`)
const selectableMetrics = topStatData && topStatData.top_stats.map(({ name }) => METRIC_MAPPING[name]).filter(name => name)
const canSelectSavedMetric = selectableMetrics && selectableMetrics.includes(savedMetric)
if (query.filters.goal) {
this.setState({ metric: 'conversions' })
} else if (canSelectSavedMetric) {
this.setState({ metric: savedMetric })
} else {
this.setState({ metric: 'visitors' })
}
}
componentWillUnmount() {
document.removeEventListener('tick', this.fetchGraphData)
document.removeEventListener('tick', this.fetchTopStatData)
}
storeTopStatsContainerHeight() {
storage.setItem(`topStatsHeight__${this.props.site.domain}`, document.getElementById('top-stats-container').clientHeight)
}
updateMetric(clickedMetric) {
if (this.state.metric == clickedMetric) return
storage.setItem(`metric__${this.props.site.domain}`, clickedMetric)
this.setState({ metric: clickedMetric, graphData: null })
}
fetchGraphData() {
const url = `/api/stats/${encodeURIComponent(this.props.site.domain)}/main-graph`
let params = { metric: this.state.metric }
const interval = this.getIntervalFromStorage()
if (interval) { params.interval = interval }
api.get(url, this.props.query, params)
.then((res) => {
this.setState({ mainGraphLoadingState: LoadingState.loaded, graphData: res })
return res
})
.catch((err) => {
console.log(err)
this.setState({ mainGraphLoadingState: LoadingState.loaded, graphData: false })
})
}
fetchTopStatData() {
const query = { ...this.props.query }
if (!isComparisonEnabled(query.comparison)) query.comparison = 'previous_period'
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/top-stats`, query)
.then((res) => {
this.setState({ topStatsLoadingState: LoadingState.loaded, topStatData: res }, () => {
this.storeTopStatsContainerHeight()
this.resetMetric()
})
return res
})
}
renderInner() {
const { query, site } = this.props;
const { graphData, metric, topStatData, topStatsLoadingState, mainGraphLoadingState } = this.state;
const theme = document.querySelector('html').classList.contains('dark') || false
const mainGraphRefreshing = (mainGraphLoadingState === LoadingState.refreshing)
const topStatAndGraphLoaded = !!(topStatData && graphData)
const shouldShow =
topStatsLoadingState === LoadingState.loaded &&
LoadingState.isLoadedOrRefreshing(mainGraphLoadingState) &&
(topStatData && mainGraphRefreshing || topStatAndGraphLoaded)
return (
<FadeIn show={shouldShow}>
<LineGraphWithRouter mainGraphRefreshing={mainGraphRefreshing} graphData={graphData} topStatData={topStatData} site={site} query={query} darkTheme={theme} metric={metric} updateMetric={this.updateMetric} updateInterval={this.updateInterval} lastLoadTimestamp={this.props.lastLoadTimestamp} />
</FadeIn> </FadeIn>
</div> )
) }
render() {
const { mainGraphLoadingState, topStatsLoadingState } = this.state
const showLoader =
[mainGraphLoadingState, topStatsLoadingState].includes(LoadingState.loading) &&
mainGraphLoadingState !== LoadingState.refreshing
return (
<LazyLoader onVisible={this.onVisible}>
<div className={"relative w-full mt-2 bg-white rounded shadow-xl dark:bg-gray-825"}>
{showLoader && renderLoader()}
{this.renderInner()}
</div>
</LazyLoader>
)
}
} }
function renderLoader() { function renderLoader() {

@ -1,40 +0,0 @@
import React from "react"
import { parseNaiveDate, isBefore } from '../../util/date'
import { Link } from 'react-router-dom'
import * as url from '../../util/url'
import { BarsArrowUpIcon } from '@heroicons/react/20/solid'
export default function WithImportedSwitch({site, topStatData}) {
if (!topStatData?.imports_exist) {
return null
}
function isBeforeNativeStats(date) {
if (!date) return false
const nativeStatsBegin = parseNaiveDate(site.nativeStatsBegin)
const parsedDate = parseNaiveDate(date)
return isBefore(parsedDate, nativeStatsBegin, "day")
}
const isQueryingImportedPeriod = isBeforeNativeStats(topStatData.from)
const isComparingImportedPeriod = isBeforeNativeStats(topStatData.comparing_from)
if (isQueryingImportedPeriod || isComparingImportedPeriod) {
const withImported = topStatData.with_imported;
const toggleColor = withImported ? " dark:text-gray-300 text-gray-700" : " dark:text-gray-500 text-gray-400"
const target = url.setQuery('with_imported', !withImported)
const tip = withImported ? "" : "do not ";
return (
<Link to={target} className="w-4 h-4 mx-2">
<div tooltip={`Stats ${tip}include imported data.`} className="cursor-pointer w-4 h-4">
<BarsArrowUpIcon className={"absolute " + toggleColor} />
</div>
</Link>
)
} else {
return null
}
}

@ -46,8 +46,7 @@ function PropFilterRow({
<Combobox <Combobox
className="mr-2" className="mr-2"
fetchOptions={fetchPropKeyOptions()} fetchOptions={fetchPropKeyOptions()}
singleOption singleOption={true}
autoFocus
values={propKey ? [propKey] : []} values={propKey ? [propKey] : []}
onSelect={(value) => onPropKeySelect(id, value)} onSelect={(value) => onPropKeySelect(id, value)}
placeholder={'Property'} placeholder={'Property'}

@ -7,7 +7,6 @@ import ListReport from '../reports/list'
import { VISITORS_METRIC, maybeWithCR } from '../reports/metrics'; import { VISITORS_METRIC, maybeWithCR } from '../reports/metrics';
import { Menu, Transition } from '@headlessui/react' import { Menu, Transition } from '@headlessui/react'
import { ChevronDownIcon } from '@heroicons/react/20/solid' import { ChevronDownIcon } from '@heroicons/react/20/solid'
import { escapeFilterValue } from '../../util/filters'
import classNames from 'classnames' import classNames from 'classnames'
const UTM_TAGS = { const UTM_TAGS = {
@ -26,7 +25,7 @@ function AllSources(props) {
} }
function getFilterFor(listItem) { function getFilterFor(listItem) {
return { source: escapeFilterValue(listItem['name']) } return { source: listItem['name'] }
} }
function renderIcon(listItem) { function renderIcon(listItem) {
@ -61,7 +60,7 @@ function UTMSources(props) {
} }
function getFilterFor(listItem) { function getFilterFor(listItem) {
return { [props.tab]: escapeFilterValue(listItem['name']) } return { [props.tab]: listItem['name'] }
} }
return ( return (

@ -1,5 +1,3 @@
const flags = JSON.parse(document.getElementById('stats-react-container').dataset.flags)
export const FILTER_GROUPS = { export const FILTER_GROUPS = {
'page': ['page', 'entry_page', 'exit_page'], 'page': ['page', 'entry_page', 'exit_page'],
'source': ['source', 'referrer'], 'source': ['source', 'referrer'],
@ -9,9 +7,7 @@ export const FILTER_GROUPS = {
'os': ['os', 'os_version'], 'os': ['os', 'os_version'],
'utm': ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'], 'utm': ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'],
'goal': ['goal'], 'goal': ['goal'],
'props': ['prop_key', 'prop_value'], 'props': ['prop_key', 'prop_value']
...(flags.hostname_filter ? { 'hostname': ['hostname'] } : {})
} }
export const NO_CONTAINS_OPERATOR = new Set(['goal', 'screen'].concat(FILTER_GROUPS['location'])) export const NO_CONTAINS_OPERATOR = new Set(['goal', 'screen'].concat(FILTER_GROUPS['location']))
@ -41,7 +37,7 @@ export function isFreeChoiceFilter(filterName) {
let NON_ESCAPED_PIPE_REGEX; let NON_ESCAPED_PIPE_REGEX;
try { try {
NON_ESCAPED_PIPE_REGEX = new RegExp("(?<!\\\\)\\|", "g") NON_ESCAPED_PIPE_REGEX = new RegExp("(?<!\\\\)\\|", "g")
} catch (_e) { } catch(_e) {
NON_ESCAPED_PIPE_REGEX = '|' NON_ESCAPED_PIPE_REGEX = '|'
} }
@ -68,19 +64,19 @@ export function parsePrefix(rawValue) {
.filter((clause) => !!clause) .filter((clause) => !!clause)
.map((val) => val.replaceAll(ESCAPED_PIPE, '|')) .map((val) => val.replaceAll(ESCAPED_PIPE, '|'))
return { type, values } return {type, values}
} }
export function parseQueryPropsFilter(query) { export function parseQueryPropsFilter(query) {
return Object.entries(query.filters['props']).map(([key, propVal]) => { return Object.entries(query.filters['props']).map(([key, propVal]) => {
const { type, values } = parsePrefix(propVal) const {type, values} = parsePrefix(propVal)
const clauses = values.map(val => { return { value: val, label: val } }) const clauses = values.map(val => { return {value: val, label: val}})
return { propKey: { label: key, value: key }, type, clauses } return { propKey: { label: key, value: key }, type, clauses }
}) })
} }
export function parseQueryFilter(query, filter) { export function parseQueryFilter(query, filter) {
const { type, values } = parsePrefix(query.filters[filter] || '') const {type, values} = parsePrefix(query.filters[filter] || '')
let labels = values let labels = values
@ -99,9 +95,9 @@ export function parseQueryFilter(query, filter) {
labels = rawLabel.split('|').filter(label => !!label) labels = rawLabel.split('|').filter(label => !!label)
} }
const clauses = values.map((value, index) => { return { value, label: labels[index] } }) const clauses = values.map((value, index) => { return {value, label: labels[index]}})
return { type, clauses } return {type, clauses}
} }
export function isFilteringOnFixedValue(query, filter) { export function isFilteringOnFixedValue(query, filter) {
@ -156,7 +152,6 @@ export const formattedFilters = {
'region': 'Region', 'region': 'Region',
'city': 'City', 'city': 'City',
'page': 'Page', 'page': 'Page',
'hostname': 'Hostname',
'entry_page': 'Entry Page', 'entry_page': 'Entry Page',
'exit_page': 'Exit Page', 'exit_page': 'Exit Page'
} }

@ -19,30 +19,12 @@ if (csrfToken && websocketUrl) {
}) })
} }
} }
let Uploaders = {}
Uploaders.S3 = function (entries, onViewError) {
entries.forEach(entry => {
let xhr = new XMLHttpRequest()
onViewError(() => xhr.abort())
xhr.onload = () => xhr.status === 200 ? entry.progress(100) : entry.error()
xhr.onerror = () => entry.error()
xhr.upload.addEventListener("progress", (event) => {
if (event.lengthComputable) {
let percent = Math.round((event.loaded / event.total) * 100)
if (percent < 100) { entry.progress(percent) }
}
})
let url = entry.meta.url
xhr.open("PUT", url, true)
xhr.send(entry.file)
})
}
let token = csrfToken.getAttribute("content") let token = csrfToken.getAttribute("content")
let url = websocketUrl.getAttribute("content") let url = websocketUrl.getAttribute("content")
let liveUrl = (url === "") ? "/live" : new URL("/live", url).href; let liveUrl = (url === "") ? "/live" : new URL("/live", url).href;
let liveSocket = new LiveSocket(liveUrl, Socket, { let liveSocket = new LiveSocket(liveUrl, Socket, {
heartbeatIntervalMs: 10000, heartbeatIntervalMs: 10000,
params: { _csrf_token: token }, hooks: Hooks, uploaders: Uploaders, dom: { params: { _csrf_token: token }, hooks: Hooks, dom: {
// for alpinejs integration // for alpinejs integration
onBeforeElUpdated(from, to) { onBeforeElUpdated(from, to) {
if (from._x_dataStack) { if (from._x_dataStack) {

@ -25,6 +25,4 @@ S3_DISABLED=false
S3_ACCESS_KEY_ID=minioadmin S3_ACCESS_KEY_ID=minioadmin
S3_SECRET_ACCESS_KEY=minioadmin S3_SECRET_ACCESS_KEY=minioadmin
S3_REGION=us-east-1 S3_REGION=us-east-1
S3_ENDPOINT=http://localhost:10000 S3_ENDPOINT=http://localhost:6000
S3_EXPORTS_BUCKET=dev-exports
S3_IMPORTS_BUCKET=dev-imports

@ -20,6 +20,4 @@ S3_DISABLED=false
S3_ACCESS_KEY_ID=minioadmin S3_ACCESS_KEY_ID=minioadmin
S3_SECRET_ACCESS_KEY=minioadmin S3_SECRET_ACCESS_KEY=minioadmin
S3_REGION=us-east-1 S3_REGION=us-east-1
S3_ENDPOINT=http://localhost:10000 S3_ENDPOINT=http://localhost:6000
S3_EXPORTS_BUCKET=test-exports
S3_IMPORTS_BUCKET=test-imports

@ -38,7 +38,7 @@ config :tailwind,
config :ua_inspector, config :ua_inspector,
database_path: "priv/ua_inspector", database_path: "priv/ua_inspector",
remote_release: "6.3.0" remote_release: "6.2.1"
config :ref_inspector, config :ref_inspector,
database_path: "priv/ref_inspector" database_path: "priv/ref_inspector"
@ -73,8 +73,4 @@ config :ex_cldr,
default_locale: "en", default_locale: "en",
default_backend: Plausible.Cldr default_backend: Plausible.Cldr
config :sentry,
enable_source_code_context: true,
root_source_code_path: [File.cwd!()]
import_config "#{config_env()}.exs" import_config "#{config_env()}.exs"

@ -231,6 +231,10 @@ maxmind_license_key = get_var_from_path_or_env(config_dir, "MAXMIND_LICENSE_KEY"
maxmind_edition = get_var_from_path_or_env(config_dir, "MAXMIND_EDITION", "GeoLite2-City") maxmind_edition = get_var_from_path_or_env(config_dir, "MAXMIND_EDITION", "GeoLite2-City")
persistent_cache_dir = get_var_from_path_or_env(config_dir, "PERSISTENT_CACHE_DIR") persistent_cache_dir = get_var_from_path_or_env(config_dir, "PERSISTENT_CACHE_DIR")
if System.get_env("DISABLE_AUTH") do
Logger.warning("DISABLE_AUTH env var is no longer supported")
end
enable_email_verification = enable_email_verification =
config_dir config_dir
|> get_var_from_path_or_env("ENABLE_EMAIL_VERIFICATION", "false") |> get_var_from_path_or_env("ENABLE_EMAIL_VERIFICATION", "false")
@ -335,16 +339,21 @@ else
database: get_var_from_path_or_env(config_dir, "DATABASE_NAME", "plausible") database: get_var_from_path_or_env(config_dir, "DATABASE_NAME", "plausible")
end end
included_environments = if sentry_dsn, do: ["prod", "staging", "dev"], else: []
sentry_app_version = runtime_metadata[:version] || app_version sentry_app_version = runtime_metadata[:version] || app_version
config :sentry, config :sentry,
dsn: sentry_dsn, dsn: sentry_dsn,
environment_name: env, environment_name: env,
included_environments: included_environments,
release: sentry_app_version, release: sentry_app_version,
tags: %{app_version: sentry_app_version}, tags: %{app_version: sentry_app_version},
enable_source_code_context: true,
root_source_code_path: [File.cwd!()],
client: Plausible.Sentry.Client, client: Plausible.Sentry.Client,
send_max_attempts: 1, send_max_attempts: 1,
before_send: {Plausible.SentryFilter, :before_send} filter: Plausible.SentryFilter,
before_send_event: {Plausible.SentryFilter, :before_send}
config :plausible, :paddle, config :plausible, :paddle,
vendor_auth_code: paddle_auth_code, vendor_auth_code: paddle_auth_code,
@ -538,16 +547,15 @@ base_queues = [
clean_invitations: 1, clean_invitations: 1,
analytics_imports: 1, analytics_imports: 1,
domain_change_transition: 1, domain_change_transition: 1,
check_accept_traffic_until: 1, check_accept_traffic_until: 1
# NOTE: maybe move s3_csv_export to cloud_queues?
s3_csv_export: 1
] ]
cloud_queues = [ cloud_queues = [
trial_notification_emails: 1, trial_notification_emails: 1,
check_usage: 1, check_usage: 1,
notify_annual_renewal: 1, notify_annual_renewal: 1,
lock_sites: 1 lock_sites: 1,
s3_csv_export: 1
] ]
queues = if(is_selfhost, do: base_queues, else: base_queues ++ cloud_queues) queues = if(is_selfhost, do: base_queues, else: base_queues ++ cloud_queues)
@ -732,14 +740,6 @@ unless s3_disabled? do
%{ %{
name: "S3_ENDPOINT", name: "S3_ENDPOINT",
example: "https://<ACCOUNT_ID>.r2.cloudflarestorage.com" example: "https://<ACCOUNT_ID>.r2.cloudflarestorage.com"
},
%{
name: "S3_EXPORTS_BUCKET",
example: "my-csv-exports-bucket"
},
%{
name: "S3_IMPORTS_BUCKET",
example: "my-csv-imports-bucket"
} }
] ]
@ -774,8 +774,4 @@ unless s3_disabled? do
scheme: s3_scheme <> "://", scheme: s3_scheme <> "://",
host: s3_host, host: s3_host,
port: s3_port port: s3_port
config :plausible, Plausible.S3,
exports_bucket: s3_env_value.("S3_EXPORTS_BUCKET"),
imports_bucket: s3_env_value.("S3_IMPORTS_BUCKET")
end end

@ -10,17 +10,21 @@ defmodule Plausible.Stats.Goal.Revenue do
@revenue_metrics @revenue_metrics
end end
def total_revenue_query() do def total_revenue_query(query) do
dynamic( from(e in query,
[e], select_merge: %{
fragment("toDecimal64(sum(?) * any(_sample_factor), 3)", e.revenue_reporting_amount) total_revenue:
fragment("toDecimal64(sum(?) * any(_sample_factor), 3)", e.revenue_reporting_amount)
}
) )
end end
def average_revenue_query() do def average_revenue_query(query) do
dynamic( from(e in query,
[e], select_merge: %{
fragment("toDecimal64(avg(?) * any(_sample_factor), 3)", e.revenue_reporting_amount) average_revenue:
fragment("toDecimal64(avg(?) * any(_sample_factor), 3)", e.revenue_reporting_amount)
}
) )
end end

@ -1,38 +0,0 @@
{
"kind": "analyticsData#batchRunReports",
"reports": [
{
"dimensionHeaders": [
{
"name": "date"
}
],
"kind": "analyticsData#runReport",
"metadata": {
"currencyCode": "USD",
"timeZone": "Europe/Warsaw"
},
"metricHeaders": [
{
"name": "screenPageViews",
"type": "TYPE_INTEGER"
}
],
"rowCount": 3,
"rows": [
{
"dimensionValues": [
{
"value": "20240302"
}
],
"metricValues": [
{
"value": "13"
}
]
}
]
}
]
}

@ -1,12 +0,0 @@
{
"account": "accounts/28425555",
"createTime": "2024-02-22T10:50:15.462Z",
"currencyCode": "USD",
"displayName": "account.one - GA4",
"name": "properties/428685444",
"parent": "accounts/28425555",
"propertyType": "PROPERTY_TYPE_ORDINARY",
"serviceLevel": "GOOGLE_ANALYTICS_STANDARD",
"timeZone": "Europe/Warsaw",
"updateTime": "2024-02-22T10:50:15.462Z"
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -10,7 +10,7 @@
"kind": "analyticsData#runReport", "kind": "analyticsData#runReport",
"metadata": { "metadata": {
"currencyCode": "USD", "currencyCode": "USD",
"timeZone": "Europe/Amsterdam" "timeZone": "Europe/Warsaw"
}, },
"metricHeaders": [ "metricHeaders": [
{ {
@ -34,749 +34,77 @@
"type": "TYPE_SECONDS" "type": "TYPE_SECONDS"
} }
], ],
"rowCount": 31, "rowCount": 3,
"rows": [ "rows": [
{ {
"dimensionValues": [ "dimensionValues": [
{ {
"value": "20240131" "value": "20240226"
} }
], ],
"metricValues": [ "metricValues": [
{ {
"value": "141" "value": "1"
}, },
{ {
"value": "195" "value": "1"
}, },
{ {
"value": "56" "value": "1"
}, },
{ {
"value": "146" "value": "1"
}, },
{ {
"value": "4815" "value": "0"
} }
] ]
}, },
{ {
"dimensionValues": [ "dimensionValues": [
{ {
"value": "20240130" "value": "20240224"
} }
], ],
"metricValues": [ "metricValues": [
{ {
"value": "115" "value": "2"
}, },
{ {
"value": "171" "value": "2"
}, },
{ {
"value": "42" "value": "2"
}, },
{ {
"value": "115" "value": "2"
}, },
{ {
"value": "3481" "value": "0"
} }
] ]
}, },
{ {
"dimensionValues": [ "dimensionValues": [
{ {
"value": "20240129" "value": "20240222"
} }
], ],
"metricValues": [ "metricValues": [
{ {
"value": "105" "value": "3"
}, },
{ {
"value": "153" "value": "13"
}, },
{ {
"value": "54" "value": "0"
}, },
{ {
"value": "113" "value": "4"
}, },
{ {
"value": "2895" "value": "29"
}
]
},
{
"dimensionValues": [
{
"value": "20240128"
}
],
"metricValues": [
{
"value": "184"
},
{
"value": "259"
},
{
"value": "74"
},
{
"value": "190"
},
{
"value": "6861"
}
]
},
{
"dimensionValues": [
{
"value": "20240127"
}
],
"metricValues": [
{
"value": "155"
},
{
"value": "202"
},
{
"value": "67"
},
{
"value": "158"
},
{
"value": "5259"
}
]
},
{
"dimensionValues": [
{
"value": "20240126"
}
],
"metricValues": [
{
"value": "132"
},
{
"value": "189"
},
{
"value": "57"
},
{
"value": "142"
},
{
"value": "5545"
}
]
},
{
"dimensionValues": [
{
"value": "20240125"
}
],
"metricValues": [
{
"value": "151"
},
{
"value": "229"
},
{
"value": "71"
},
{
"value": "155"
},
{
"value": "5365"
}
]
},
{
"dimensionValues": [
{
"value": "20240124"
}
],
"metricValues": [
{
"value": "137"
},
{
"value": "221"
},
{
"value": "64"
},
{
"value": "148"
},
{
"value": "4454"
}
]
},
{
"dimensionValues": [
{
"value": "20240123"
}
],
"metricValues": [
{
"value": "166"
},
{
"value": "267"
},
{
"value": "61"
},
{
"value": "171"
},
{
"value": "4850"
}
]
},
{
"dimensionValues": [
{
"value": "20240122"
}
],
"metricValues": [
{
"value": "161"
},
{
"value": "233"
},
{
"value": "73"
},
{
"value": "165"
},
{
"value": "4871"
}
]
},
{
"dimensionValues": [
{
"value": "20240121"
}
],
"metricValues": [
{
"value": "254"
},
{
"value": "397"
},
{
"value": "114"
},
{
"value": "267"
},
{
"value": "8845"
}
]
},
{
"dimensionValues": [
{
"value": "20240120"
}
],
"metricValues": [
{
"value": "214"
},
{
"value": "383"
},
{
"value": "100"
},
{
"value": "223"
},
{
"value": "6914"
}
]
},
{
"dimensionValues": [
{
"value": "20240119"
}
],
"metricValues": [
{
"value": "381"
},
{
"value": "5571"
},
{
"value": "100"
},
{
"value": "228"
},
{
"value": "98549"
}
]
},
{
"dimensionValues": [
{
"value": "20240118"
}
],
"metricValues": [
{
"value": "177"
},
{
"value": "278"
},
{
"value": "86"
},
{
"value": "186"
},
{
"value": "5553"
}
]
},
{
"dimensionValues": [
{
"value": "20240117"
}
],
"metricValues": [
{
"value": "204"
},
{
"value": "271"
},
{
"value": "97"
},
{
"value": "216"
},
{
"value": "6777"
}
]
},
{
"dimensionValues": [
{
"value": "20240116"
}
],
"metricValues": [
{
"value": "200"
},
{
"value": "280"
},
{
"value": "65"
},
{
"value": "203"
},
{
"value": "9381"
}
]
},
{
"dimensionValues": [
{
"value": "20240115"
}
],
"metricValues": [
{
"value": "255"
},
{
"value": "311"
},
{
"value": "86"
},
{
"value": "269"
},
{
"value": "12365"
}
]
},
{
"dimensionValues": [
{
"value": "20240114"
}
],
"metricValues": [
{
"value": "243"
},
{
"value": "302"
},
{
"value": "86"
},
{
"value": "257"
},
{
"value": "11073"
}
]
},
{
"dimensionValues": [
{
"value": "20240113"
}
],
"metricValues": [
{
"value": "231"
},
{
"value": "276"
},
{
"value": "92"
},
{
"value": "244"
},
{
"value": "10084"
}
]
},
{
"dimensionValues": [
{
"value": "20240112"
}
],
"metricValues": [
{
"value": "215"
},
{
"value": "265"
},
{
"value": "75"
},
{
"value": "225"
},
{
"value": "10195"
}
]
},
{
"dimensionValues": [
{
"value": "20240111"
}
],
"metricValues": [
{
"value": "183"
},
{
"value": "235"
},
{
"value": "64"
},
{
"value": "191"
},
{
"value": "8200"
}
]
},
{
"dimensionValues": [
{
"value": "20240110"
}
],
"metricValues": [
{
"value": "190"
},
{
"value": "244"
},
{
"value": "61"
},
{
"value": "203"
},
{
"value": "9056"
}
]
},
{
"dimensionValues": [
{
"value": "20240109"
}
],
"metricValues": [
{
"value": "201"
},
{
"value": "290"
},
{
"value": "63"
},
{
"value": "213"
},
{
"value": "11651"
}
]
},
{
"dimensionValues": [
{
"value": "20240108"
}
],
"metricValues": [
{
"value": "195"
},
{
"value": "235"
},
{
"value": "71"
},
{
"value": "209"
},
{
"value": "7946"
}
]
},
{
"dimensionValues": [
{
"value": "20240107"
}
],
"metricValues": [
{
"value": "205"
},
{
"value": "274"
},
{
"value": "80"
},
{
"value": "218"
},
{
"value": "10048"
}
]
},
{
"dimensionValues": [
{
"value": "20240106"
}
],
"metricValues": [
{
"value": "256"
},
{
"value": "303"
},
{
"value": "119"
},
{
"value": "281"
},
{
"value": "8440"
}
]
},
{
"dimensionValues": [
{
"value": "20240105"
}
],
"metricValues": [
{
"value": "226"
},
{
"value": "270"
},
{
"value": "83"
},
{
"value": "237"
},
{
"value": "9311"
}
]
},
{
"dimensionValues": [
{
"value": "20240104"
}
],
"metricValues": [
{
"value": "223"
},
{
"value": "274"
},
{
"value": "81"
},
{
"value": "236"
},
{
"value": "12051"
}
]
},
{
"dimensionValues": [
{
"value": "20240103"
}
],
"metricValues": [
{
"value": "233"
},
{
"value": "283"
},
{
"value": "79"
},
{
"value": "245"
},
{
"value": "10628"
}
]
},
{
"dimensionValues": [
{
"value": "20240102"
}
],
"metricValues": [
{
"value": "203"
},
{
"value": "269"
},
{
"value": "60"
},
{
"value": "210"
},
{
"value": "11168"
}
]
},
{
"dimensionValues": [
{
"value": "20240101"
}
],
"metricValues": [
{
"value": "191"
},
{
"value": "224"
},
{
"value": "71"
},
{
"value": "197"
},
{
"value": "8080"
} }
] ]
} }

@ -1,38 +0,0 @@
{
"reports": [
{
"columnHeader": {
"dimensions": [
"ga:date"
],
"metricHeader": {
"metricHeaderEntries": [
{
"name": "ga:pageviews",
"type": "INTEGER"
}
]
}
},
"data": {
"isDataGolden": true,
"rowCount": 849,
"rows": [
{
"dimensions": [
"20200421"
],
"metrics": [
{
"values": [
"37"
]
}
]
}
]
},
"nextPageToken": "1"
}
]
}

@ -1,38 +0,0 @@
{
"reports": [
{
"columnHeader": {
"dimensions": [
"ga:date"
],
"metricHeader": {
"metricHeaderEntries": [
{
"name": "ga:pageviews",
"type": "INTEGER"
}
]
}
},
"data": {
"isDataGolden": true,
"rowCount": 849,
"rows": [
{
"dimensions": [
"20120118"
],
"metrics": [
{
"values": [
"37"
]
}
]
}
]
},
"nextPageToken": "1"
}
]
}

@ -1,38 +0,0 @@
{
"reports": [
{
"columnHeader": {
"dimensions": [
"ga:date"
],
"metricHeader": {
"metricHeaderEntries": [
{
"name": "ga:pageviews",
"type": "INTEGER"
}
]
}
},
"data": {
"isDataGolden": true,
"rowCount": 849,
"rows": [
{
"dimensions": [
"20170118"
],
"metrics": [
{
"values": [
"37"
]
}
]
}
]
},
"nextPageToken": "1"
}
]
}

@ -24,7 +24,6 @@ defmodule Mix.Tasks.SendPageview do
page: :string, page: :string,
referrer: :string, referrer: :string,
host: :string, host: :string,
hostname: :string,
event: :string, event: :string,
props: :string, props: :string,
revenue_currency: :string, revenue_currency: :string,
@ -87,7 +86,6 @@ defmodule Mix.Tasks.SendPageview do
referrer = Keyword.get(opts, :referrer, @default_referrer) referrer = Keyword.get(opts, :referrer, @default_referrer)
event = Keyword.get(opts, :event, @default_event) event = Keyword.get(opts, :event, @default_event)
props = Keyword.get(opts, :props, @default_props) props = Keyword.get(opts, :props, @default_props)
hostname = Keyword.get(opts, :hostname, domain)
revenue = revenue =
if Keyword.get(opts, :revenue_currency) do if Keyword.get(opts, :revenue_currency) do
@ -99,7 +97,7 @@ defmodule Mix.Tasks.SendPageview do
%{ %{
name: event, name: event,
url: "http://#{hostname}#{page}", url: "http://#{domain}#{page}",
domain: domain, domain: domain,
referrer: referrer, referrer: referrer,
props: props, props: props,

@ -77,21 +77,6 @@ defmodule Plausible.Application do
interval: :timer.seconds(35), interval: :timer.seconds(35),
warmer_fn: :refresh_updated_recently warmer_fn: :refresh_updated_recently
]}, ]},
{Plausible.Shield.PageRuleCache, ttl_check_interval: false, ets_options: [:bag]},
{Plausible.Cache.Warmer,
[
child_name: Plausible.Shield.PageRuleCache.All,
cache_impl: Plausible.Shield.PageRuleCache,
interval: :timer.minutes(3) + Enum.random(1..:timer.seconds(10)),
warmer_fn: :refresh_all
]},
{Plausible.Cache.Warmer,
[
child_name: Plausible.Shield.PageRuleCache.RecentlyUpdated,
cache_impl: Plausible.Shield.PageRuleCache,
interval: :timer.seconds(35),
warmer_fn: :refresh_updated_recently
]},
{Plausible.Auth.TOTP.Vault, key: totp_vault_key()}, {Plausible.Auth.TOTP.Vault, key: totp_vault_key()},
PlausibleWeb.Endpoint, PlausibleWeb.Endpoint,
{Oban, Application.get_env(:plausible, Oban)}, {Oban, Application.get_env(:plausible, Oban)},
@ -137,10 +122,10 @@ defmodule Plausible.Application do
defp maybe_add_sentry_pool(pool_config) do defp maybe_add_sentry_pool(pool_config) do
case Sentry.Config.dsn() do case Sentry.Config.dsn() do
{"http" <> _rest = url, _, _} -> dsn when is_binary(dsn) ->
Map.put(pool_config, url, size: 50) Map.put(pool_config, dsn, size: 50)
nil -> _ ->
pool_config pool_config
end end
end end

@ -176,16 +176,26 @@ defmodule Plausible.Cache do
defp refresh(mode, query, opts) when mode in @modes do defp refresh(mode, query, opts) when mode in @modes do
cache_name = Keyword.get(opts, :cache_name, name()) cache_name = Keyword.get(opts, :cache_name, name())
Plausible.PromEx.Plugins.PlausibleMetrics.measure_duration( measure_duration(telemetry_event_refresh(cache_name, mode), fn ->
telemetry_event_refresh(cache_name, mode), items = Plausible.Repo.all(query)
fn -> :ok = merge_items(items, opts)
items = Plausible.Repo.all(query) end)
:ok = merge_items(items, opts)
end
)
:ok :ok
end end
defp measure_duration(event, fun) when is_function(fun, 0) do
{duration, result} = time_it(fun)
:telemetry.execute(event, %{duration: duration}, %{})
result
end
defp time_it(fun) do
start = System.monotonic_time()
result = fun.()
stop = System.monotonic_time()
{stop - start, result}
end
end end
end end
end end

@ -28,7 +28,7 @@ defmodule Plausible.Cache.Stats do
:ets.new(__MODULE__, [ :ets.new(__MODULE__, [
:public, :public,
:named_table, :named_table,
:set, :ordered_set,
read_concurrency: true, read_concurrency: true,
write_concurrency: true write_concurrency: true
]) ])

@ -65,28 +65,4 @@ defmodule Plausible.ClickhouseEventV2 do
) )
|> validate_required([:name, :site_id, :hostname, :pathname, :user_id, :timestamp]) |> validate_required([:name, :site_id, :hostname, :pathname, :user_id, :timestamp])
end end
@session_properties [
:session_id,
:referrer,
:referrer_source,
:utm_medium,
:utm_source,
:utm_campaign,
:utm_content,
:utm_term,
:country_code,
:subdivision1_code,
:subdivision2_code,
:city_geoname_id,
:screen_size,
:operating_system,
:operating_system_version,
:browser,
:browser_version
]
def merge_session(%__MODULE__{} = event, session) do
Map.merge(event, Map.take(session, @session_properties))
end
end end

@ -43,7 +43,6 @@ defmodule Plausible.ClickhouseSessionV2 do
field :is_bounce, BoolUInt8 field :is_bounce, BoolUInt8
field :entry_page, :string field :entry_page, :string
field :exit_page, :string field :exit_page, :string
field :exit_page_hostname, :string
field :pageviews, Ch, type: "Int32" field :pageviews, Ch, type: "Int32"
field :events, Ch, type: "Int32" field :events, Ch, type: "Int32"
field :sign, Ch, type: "Int8" field :sign, Ch, type: "Int8"

@ -1,188 +0,0 @@
defmodule Plausible.DataMigration.SiteImports do
@moduledoc """
Site imports migration backfilling SiteImport entries for old imports
and alters import end dates to match actual end date of respective import stats.
"""
import Ecto.Query
alias Plausible.ClickhouseRepo
alias Plausible.Imported
alias Plausible.Repo
alias Plausible.Site
def run(opts \\ []) do
dry_run? = Keyword.get(opts, :dry_run?, true)
site_import_query =
from(i in Imported.SiteImport, where: i.site_id == parent_as(:site).id, select: 1)
sites_with_imports =
from(s in Site, as: :site, where: not is_nil(s.imported_data) or exists(site_import_query))
|> Repo.all(log: false)
sites_count = length(sites_with_imports)
IO.puts("Processing #{sites_count} sites with imports (DRY RUN: #{dry_run?})...")
for {site, idx} <- Enum.with_index(sites_with_imports) do
site_imports =
from(i in Imported.SiteImport, where: i.site_id == ^site.id)
|> Repo.all(log: false)
IO.puts(
"Processing site ID #{site.id} (#{idx + 1} / #{sites_count}) (imported_data: #{is_struct(site.imported_data)}, site_imports: #{length(site_imports)})"
)
site_imports =
if site.imported_data && not Enum.any?(site_imports, & &1.legacy) do
IO.puts("Creating legacy site import entry for site ID #{site.id}")
# create legacy entry if there's not one yet
params =
site.imported_data
|> Imported.SiteImport.from_legacy()
|> Map.put(:site_id, site.id)
|> Map.take([:legacy, :start_date, :end_date, :source, :status, :site_id])
legacy_site_import =
%Imported.SiteImport{}
|> Ecto.Changeset.change(params)
|> insert!(dry_run?)
[legacy_site_import | site_imports]
else
IO.puts("Legacy site import entry for site ID #{site.id} already exists")
site_imports
end
# adjust end date for each site import
for site_import <- site_imports do
IO.puts(
"Adjusting end date for site import #{site_import.id} (site ID #{site.id}, start date: #{site_import.start_date}, end date: #{site_import.end_date})"
)
import_ids =
if site_import.legacy do
[0, site_import.id]
else
[site_import.id]
end
end_date = imported_stats_end_date(site.id, import_ids)
if !end_date do
IO.puts(
"Site import #{site_import.id} (site ID #{site.id}) does not have any recorded stats. Removing it."
)
if site_import.legacy do
clear_imported_data(site, dry_run?)
end
delete!(site_import, dry_run?)
else
end_date =
if Date.compare(end_date, site_import.end_date) in [:lt, :eq] do
end_date
else
IO.puts(
"Site import #{site_import.id} (site ID #{site.id}) computed end date is later than the current one. Skipping."
)
site_import.end_date
end
site_import
|> Ecto.Changeset.change(end_date: end_date)
|> update!(dry_run?)
IO.puts(
"End date of site import #{site_import.id} (site ID #{site.id}) adjusted to #{end_date}"
)
end
end
IO.puts("Done processing site ID #{site.id}")
end
IO.puts("Finished")
end
# Exposed for testing purposes
@doc false
def imported_stats_end_date(site_id, import_ids) do
[first_schema | schemas] = Imported.schemas()
query =
Enum.reduce(schemas, max_date_query(first_schema, site_id, import_ids), fn schema, query ->
from(s in subquery(union_all(query, ^max_date_query(schema, site_id, import_ids))))
end)
dates = ClickhouseRepo.all(from(q in query, select: q.max_date), log: false)
if dates != [] do
case Enum.max(dates, Date) do
# no stats for this domain yet
~D[1970-01-01] ->
nil
date ->
date
end
else
nil
end
end
defp insert!(changeset, false = _dry_run?) do
Repo.insert!(changeset)
end
defp insert!(changeset, true = _dry_run?) do
if changeset.valid? do
changeset
|> Ecto.Changeset.change(id: 0)
|> Ecto.Changeset.apply_changes()
else
raise "Invalid insert: #{inspect(changeset)}"
end
end
defp clear_imported_data(site, false = _dry_run?) do
Repo.update_all(from(s in Site, where: s.id == ^site.id), set: [imported_data: nil])
end
defp clear_imported_data(site, true = _dry_run?) do
%{site | imported_data: nil}
end
defp update!(changeset, false = _dry_run?) do
Repo.update!(changeset)
end
defp update!(changeset, true = _dry_run?) do
if changeset.valid? do
Ecto.Changeset.apply_changes(changeset)
else
raise "Invalid update: #{inspect(changeset)}"
end
end
defp delete!(entity, false = _dry_run?) do
Repo.delete!(entity)
end
defp delete!(entity, true = _dry_run?) do
entity
end
defp max_date_query(schema, site_id, import_ids) do
from(q in schema,
where: q.site_id == ^site_id,
where: q.import_id in ^import_ids,
select: %{max_date: fragment("max(?)", q.date)}
)
end
end

@ -6,32 +6,6 @@ defmodule Plausible.Exports do
require Plausible require Plausible
import Ecto.Query import Ecto.Query
@doc """
Renders filename for the Zip archive containing the exported CSV files.
Examples:
iex> archive_filename("plausible.io", ~D[2021-01-01], ~D[2024-12-31])
"plausible_io_20210101_20241231.zip"
iex> archive_filename("Bücher.example", ~D[2021-01-01], ~D[2024-12-31])
"Bücher_example_20210101_20241231.zip"
"""
def archive_filename(domain, min_date, max_date) do
name =
Enum.join(
[
String.replace(domain, ".", "_"),
Calendar.strftime(min_date, "%Y%m%d"),
Calendar.strftime(max_date, "%Y%m%d")
],
"_"
)
name <> ".zip"
end
@doc """ @doc """
Builds Ecto queries to export data from `events_v2` and `sessions_v2` Builds Ecto queries to export data from `events_v2` and `sessions_v2`
tables into the format of `imported_*` tables for a website. tables into the format of `imported_*` tables for a website.
@ -118,27 +92,51 @@ defmodule Plausible.Exports do
end end
end end
defmacrop pageviews(t) do
quote do
selected_as(
fragment("greatest(sum(?*?),0)", unquote(t).sign, unquote(t).pageviews),
:pageviews
)
end
end
@spec export_visitors_q(pos_integer) :: Ecto.Query.t() @spec export_visitors_q(pos_integer) :: Ecto.Query.t()
def export_visitors_q(site_id) do def export_visitors_q(site_id) do
from s in sampled("sessions_v2"), visitors_sessions_q =
where: s.site_id == ^site_id, from s in sampled("sessions_v2"),
group_by: selected_as(:date), where: s.site_id == ^site_id,
group_by: selected_as(:date),
select: %{
date: date(s.start),
bounces: bounces(s),
visits: visits(s),
visit_duration: visit_duration(s)
# NOTE: can we use just sessions_v2 table in this query? sum(pageviews) and visitors(s)?
# visitors: visitors(s)
}
visitors_events_q =
from e in sampled("events_v2"),
where: e.site_id == ^site_id,
group_by: selected_as(:date),
select: %{
date: date(e.timestamp),
visitors: visitors(e),
pageviews:
selected_as(
fragment("toUInt64(round(countIf(?='pageview')*any(_sample_factor)))", e.name),
:pageviews
)
}
visitors_q =
"e"
|> with_cte("e", as: ^visitors_events_q)
|> with_cte("s", as: ^visitors_sessions_q)
from e in visitors_q,
full_join: s in "s",
on: e.date == s.date,
order_by: selected_as(:date),
select: [ select: [
date(s.start), selected_as(fragment("greatest(?,?)", s.date, e.date), :date),
visitors(s), e.visitors,
pageviews(s), e.pageviews,
bounces(s), s.bounces,
visits(s), s.visits,
visit_duration(s) s.visit_duration
] ]
end end
@ -149,8 +147,6 @@ defmodule Plausible.Exports do
group_by: [ group_by: [
selected_as(:date), selected_as(:date),
selected_as(:source), selected_as(:source),
s.referrer,
s.utm_source,
s.utm_medium, s.utm_medium,
s.utm_campaign, s.utm_campaign,
s.utm_content, s.utm_content,
@ -160,13 +156,10 @@ defmodule Plausible.Exports do
select: [ select: [
date(s.start), date(s.start),
selected_as(s.referrer_source, :source), selected_as(s.referrer_source, :source),
s.referrer,
s.utm_source,
s.utm_medium, s.utm_medium,
s.utm_campaign, s.utm_campaign,
s.utm_content, s.utm_content,
s.utm_term, s.utm_term,
pageviews(s),
visitors(s), visitors(s),
visits(s), visits(s),
visit_duration(s), visit_duration(s),
@ -191,7 +184,6 @@ defmodule Plausible.Exports do
hostname: e.hostname, hostname: e.hostname,
name: e.name, name: e.name,
user_id: e.user_id, user_id: e.user_id,
session_id: e.session_id,
_sample_factor: fragment("_sample_factor") _sample_factor: fragment("_sample_factor")
} }
@ -202,10 +194,6 @@ defmodule Plausible.Exports do
date(e.timestamp), date(e.timestamp),
selected_as(fragment("any(?)", e.hostname), :hostname), selected_as(fragment("any(?)", e.hostname), :hostname),
selected_as(e.pathname, :page), selected_as(e.pathname, :page),
selected_as(
fragment("toUInt64(round(uniq(?)*any(_sample_factor)))", e.session_id),
:visits
),
visitors(e), visitors(e),
selected_as( selected_as(
fragment("toUInt64(round(countIf(?='pageview')*any(_sample_factor)))", e.name), fragment("toUInt64(round(countIf(?='pageview')*any(_sample_factor)))", e.name),
@ -238,8 +226,7 @@ defmodule Plausible.Exports do
:entrances :entrances
), ),
visit_duration(s), visit_duration(s),
bounces(s), bounces(s)
pageviews(s)
] ]
end end
@ -253,13 +240,10 @@ defmodule Plausible.Exports do
date(s.start), date(s.start),
s.exit_page, s.exit_page,
visitors(s), visitors(s),
visit_duration(s),
selected_as( selected_as(
fragment("toUInt64(round(sum(?)*any(_sample_factor)))", s.sign), fragment("toUInt64(round(sum(?)*any(_sample_factor)))", s.sign),
:exits :exits
), )
bounces(s),
pageviews(s)
] ]
end end
@ -278,8 +262,7 @@ defmodule Plausible.Exports do
visitors(s), visitors(s),
visits(s), visits(s),
visit_duration(s), visit_duration(s),
bounces(s), bounces(s)
pageviews(s)
] ]
end end
@ -295,8 +278,7 @@ defmodule Plausible.Exports do
visitors(s), visitors(s),
visits(s), visits(s),
visit_duration(s), visit_duration(s),
bounces(s), bounces(s)
pageviews(s)
] ]
end end
@ -304,17 +286,15 @@ defmodule Plausible.Exports do
def export_browsers_q(site_id) do def export_browsers_q(site_id) do
from s in sampled("sessions_v2"), from s in sampled("sessions_v2"),
where: s.site_id == ^site_id, where: s.site_id == ^site_id,
group_by: [selected_as(:date), s.browser, s.browser_version], group_by: [selected_as(:date), s.browser],
order_by: selected_as(:date), order_by: selected_as(:date),
select: [ select: [
date(s.start), date(s.start),
s.browser, s.browser,
s.browser_version,
visitors(s), visitors(s),
visits(s), visits(s),
visit_duration(s), visit_duration(s),
bounces(s), bounces(s)
pageviews(s)
] ]
end end
@ -322,17 +302,15 @@ defmodule Plausible.Exports do
def export_operating_systems_q(site_id) do def export_operating_systems_q(site_id) do
from s in sampled("sessions_v2"), from s in sampled("sessions_v2"),
where: s.site_id == ^site_id, where: s.site_id == ^site_id,
group_by: [selected_as(:date), s.operating_system, s.operating_system_version], group_by: [selected_as(:date), s.operating_system],
order_by: selected_as(:date), order_by: selected_as(:date),
select: [ select: [
date(s.start), date(s.start),
s.operating_system, s.operating_system,
s.operating_system_version,
visitors(s), visitors(s),
visits(s), visits(s),
visit_duration(s), visit_duration(s),
bounces(s), bounces(s)
pageviews(s)
] ]
end end

@ -80,14 +80,6 @@ defmodule Plausible.Goals do
def find_or_create(_, %{"goal_type" => "page"}), do: {:missing, "page_path"} def find_or_create(_, %{"goal_type" => "page"}), do: {:missing, "page_path"}
def list_revenue_goals(site) do
from(g in Plausible.Goal,
where: g.site_id == ^site.id and not is_nil(g.currency),
select: %{event_name: g.event_name, currency: g.currency}
)
|> Plausible.Repo.all()
end
def for_site(site, opts \\ []) do def for_site(site, opts \\ []) do
site site
|> for_site_query(opts) |> for_site_query(opts)

@ -23,46 +23,16 @@ defmodule Plausible.Google.API do
def import_authorize_url(site_id, redirect_to, opts \\ []) do def import_authorize_url(site_id, redirect_to, opts \\ []) do
legacy = Keyword.get(opts, :legacy, true) legacy = Keyword.get(opts, :legacy, true)
ga4 = Keyword.get(opts, :ga4, false)
"https://accounts.google.com/o/oauth2/v2/auth?client_id=#{client_id()}&redirect_uri=#{redirect_uri()}&prompt=consent&response_type=code&access_type=offline&scope=#{@import_scope}&state=" <> "https://accounts.google.com/o/oauth2/v2/auth?client_id=#{client_id()}&redirect_uri=#{redirect_uri()}&prompt=consent&response_type=code&access_type=offline&scope=#{@import_scope}&state=" <>
Jason.encode!([site_id, redirect_to, legacy]) Jason.encode!([site_id, redirect_to, legacy, ga4])
end end
def fetch_access_token!(code) do def fetch_access_token!(code) do
HTTP.fetch_access_token!(code) HTTP.fetch_access_token!(code)
end end
def list_properties_and_views(access_token) do
with {:ok, properties} <- Plausible.Google.GA4.API.list_properties(access_token),
{:ok, views} <- Plausible.Google.UA.API.list_views(access_token) do
{:ok, properties ++ views}
end
end
def get_property_or_view(access_token, property_or_view) do
if property?(property_or_view) do
Plausible.Google.GA4.API.get_property(access_token, property_or_view)
else
Plausible.Google.UA.API.get_view(access_token, property_or_view)
end
end
def get_analytics_start_date(access_token, property_or_view) do
if property?(property_or_view) do
Plausible.Google.GA4.API.get_analytics_start_date(access_token, property_or_view)
else
Plausible.Google.UA.API.get_analytics_start_date(access_token, property_or_view)
end
end
def get_analytics_end_date(access_token, property_or_view) do
if property?(property_or_view) do
Plausible.Google.GA4.API.get_analytics_end_date(access_token, property_or_view)
else
Plausible.Google.UA.API.get_analytics_end_date(access_token, property_or_view)
end
end
def fetch_verified_properties(auth) do def fetch_verified_properties(auth) do
with {:ok, access_token} <- maybe_refresh_token(auth), with {:ok, access_token} <- maybe_refresh_token(auth),
{:ok, sites} <- Plausible.Google.HTTP.list_sites(access_token) do {:ok, sites} <- Plausible.Google.HTTP.list_sites(access_token) do
@ -120,8 +90,6 @@ defmodule Plausible.Google.API do
end end
end end
def property?(value), do: String.starts_with?(value, "properties/")
defp do_refresh_token(refresh_token) do defp do_refresh_token(refresh_token) do
case HTTP.refresh_auth_token(refresh_token) do case HTTP.refresh_auth_token(refresh_token) do
{:ok, %{"access_token" => new_access_token, "expires_in" => expires_in}} -> {:ok, %{"access_token" => new_access_token, "expires_in" => expires_in}} ->

@ -25,35 +25,29 @@ defmodule Plausible.Google.GA4.API do
accounts accounts
|> Enum.filter(& &1["propertySummaries"]) |> Enum.filter(& &1["propertySummaries"])
|> Enum.map(fn account -> |> Enum.map(fn account ->
%{"account" => account_id, "displayName" => account_name} = account {"#{account["displayName"]} (#{account["account"]})",
{"#{account_name} (#{account_id})",
Enum.map(account["propertySummaries"], fn property -> Enum.map(account["propertySummaries"], fn property ->
%{"displayName" => property_name, "property" => property_id} = property {"#{property["displayName"]} (#{property["property"]})", property["property"]}
{"#{property_name} (#{property_id})", property_id}
end)} end)}
end) end)
{:ok, accounts} {:ok, accounts}
{:error, cause} -> error ->
{:error, cause} error
end end
end end
def get_property(access_token, lookup_property) do def get_property(access_token, lookup_property) do
case GA4.HTTP.get_property(access_token, lookup_property) do case list_properties(access_token) do
{:ok, property} -> {:ok, properties} ->
%{"displayName" => property_name, "name" => property_id, "account" => account_id} = property =
property properties
|> Enum.map(&elem(&1, 1))
{:ok, |> List.flatten()
%{ |> Enum.find(fn {_name, property} -> property == lookup_property end)
id: property_id,
name: "#{property_name} (#{property_id})", {:ok, property}
account_id: account_id
}}
{:error, cause} -> {:error, cause} ->
{:error, cause} {:error, cause}
@ -64,10 +58,6 @@ defmodule Plausible.Google.GA4.API do
GA4.HTTP.get_analytics_start_date(access_token, property) GA4.HTTP.get_analytics_start_date(access_token, property)
end end
def get_analytics_end_date(access_token, property) do
GA4.HTTP.get_analytics_end_date(access_token, property)
end
def import_analytics(date_range, property, auth, persist_fn) do def import_analytics(date_range, property, auth, persist_fn) do
Logger.debug( Logger.debug(
"[#{inspect(__MODULE__)}:#{property}] Starting import from #{date_range.first} to #{date_range.last}" "[#{inspect(__MODULE__)}:#{property}] Starting import from #{date_range.first} to #{date_range.last}"

@ -49,8 +49,9 @@ defmodule Plausible.Google.GA4.HTTP do
) )
with {:ok, %{body: body}} <- response, with {:ok, %{body: body}} <- response,
# File.write!("fixture/ga4_report_#{report_request.dataset}.json", Jason.encode!(body)),
{:ok, report} <- parse_report_from_response(body), {:ok, report} <- parse_report_from_response(body),
row_count <- Map.fetch!(report, "rowCount"), row_count <- Map.get(report, "rowCount"),
{:ok, report} <- convert_to_maps(report) do {:ok, report} <- convert_to_maps(report) do
{:ok, {report, row_count}} {:ok, {report, row_count}}
else else
@ -129,7 +130,7 @@ defmodule Plausible.Google.GA4.HTTP do
end end
def list_accounts_for_user(access_token) do def list_accounts_for_user(access_token) do
url = "#{admin_api_url()}/v1beta/accountSummaries?pageSize=200" url = "#{admin_api_url()}/v1beta/accountSummaries"
headers = [{"Authorization", "Bearer #{access_token}"}] headers = [{"Authorization", "Bearer #{access_token}"}]
@ -140,55 +141,14 @@ defmodule Plausible.Google.GA4.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed} {:error, :authentication_failed}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout} Sentry.capture_message("Error listing Google accounts for user", extra: %{error: error})
{:error, error} ->
Sentry.capture_message("Error listing GA4 accounts for user", extra: %{error: error})
{:error, :unknown}
end
end
def get_property(access_token, property) do
url = "#{admin_api_url()}/v1beta/#{property}"
headers = [{"Authorization", "Bearer #{access_token}"}]
case HTTPClient.impl().get(url, headers) do
{:ok, %Finch.Response{body: body, status: 200}} ->
{:ok, body}
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed}
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [404] ->
{:error, :not_found}
{:error, %{reason: :timeout}} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error retrieving GA4 property #{property}",
extra: %{error: error}
)
{:error, :unknown} {:error, :unknown}
end end
end end
@earliest_valid_date "2015-08-14" @earliest_valid_date "2015-08-14"
def get_analytics_start_date(access_token, property) do def get_analytics_start_date(access_token, property) do
get_analytics_boundary_date(access_token, property, :start)
end
def get_analytics_end_date(access_token, property) do
get_analytics_boundary_date(access_token, property, :end)
end
defp get_analytics_boundary_date(access_token, property, edge) do
descending? = edge == :end
params = %{ params = %{
requests: [ requests: [
%{ %{
@ -199,7 +159,7 @@ defmodule Plausible.Google.GA4.HTTP do
dimensions: [%{name: "date"}], dimensions: [%{name: "date"}],
metrics: [%{name: "screenPageViews"}], metrics: [%{name: "screenPageViews"}],
orderBys: [ orderBys: [
%{dimension: %{dimensionName: "date", orderType: "ALPHANUMERIC"}, desc: descending?} %{dimension: %{dimensionName: "date", orderType: "ALPHANUMERIC"}, desc: false}
], ],
limit: 1 limit: 1
} }
@ -224,18 +184,13 @@ defmodule Plausible.Google.GA4.HTTP do
{:ok, date} {:ok, date}
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %{reason: %Finch.Response{body: body}}} ->
{:error, :authentication_failed} Sentry.capture_message("Error fetching GA4 start date", extra: %{body: inspect(body)})
{:error, body}
{:error, %{reason: :timeout}} ->
{:error, :timeout}
{:error, error} -> {:error, %{reason: reason} = e} ->
Sentry.capture_message("Error retrieving GA4 #{edge} date", Sentry.capture_message("Error fetching GA4 start date", extra: %{error: inspect(e)})
extra: %{error: error} {:error, reason}
)
{:error, :unknown}
end end
end end

@ -46,11 +46,9 @@ defmodule Plausible.Google.GA4.ReportRequest do
"sessionMedium", "sessionMedium",
"sessionCampaignName", "sessionCampaignName",
"sessionManualAdContent", "sessionManualAdContent",
"sessionGoogleAdsKeyword", "sessionGoogleAdsKeyword"
"pageReferrer"
], ],
metrics: [ metrics: [
"screenPageViews",
"totalUsers", "totalUsers",
"sessions", "sessions",
"bounces = sessions - engagedSessions", "bounces = sessions - engagedSessions",
@ -61,13 +59,12 @@ defmodule Plausible.Google.GA4.ReportRequest do
dataset: "imported_pages", dataset: "imported_pages",
dimensions: ["date", "hostName", "pagePath"], dimensions: ["date", "hostName", "pagePath"],
# NOTE: no exits as GA4 DATA API does not provide that metric # NOTE: no exits as GA4 DATA API does not provide that metric
metrics: ["totalUsers", "screenPageViews", "sessions", "userEngagementDuration"] metrics: ["totalUsers", "screenPageViews", "userEngagementDuration"]
}, },
%__MODULE__{ %__MODULE__{
dataset: "imported_entry_pages", dataset: "imported_entry_pages",
dimensions: ["date", "landingPage"], dimensions: ["date", "landingPage"],
metrics: [ metrics: [
"screenPageViews",
"totalUsers", "totalUsers",
"sessions", "sessions",
"userEngagementDuration", "userEngagementDuration",
@ -78,19 +75,12 @@ defmodule Plausible.Google.GA4.ReportRequest do
# %__MODULE__{ # %__MODULE__{
# dataset: "imported_exit_pages", # dataset: "imported_exit_pages",
# dimensions: ["date", "ga:exitPagePath"], # dimensions: ["date", "ga:exitPagePath"],
# metrics: [ # metrics: ["totalUsers", "sessions"]
# "totalUsers",
# "sessions",
# "screenPageViews",
# "userEngagementDuration",
# "bounces = sessions - engagedSessions"
# ]
# }, # },
%__MODULE__{ %__MODULE__{
dataset: "imported_locations", dataset: "imported_locations",
dimensions: ["date", "countryId", "region", "city"], dimensions: ["date", "countryId", "region", "city"],
metrics: [ metrics: [
"screenPageViews",
"totalUsers", "totalUsers",
"sessions", "sessions",
"bounces = sessions - engagedSessions", "bounces = sessions - engagedSessions",
@ -101,7 +91,6 @@ defmodule Plausible.Google.GA4.ReportRequest do
dataset: "imported_devices", dataset: "imported_devices",
dimensions: ["date", "deviceCategory"], dimensions: ["date", "deviceCategory"],
metrics: [ metrics: [
"screenPageViews",
"totalUsers", "totalUsers",
"sessions", "sessions",
"bounces = sessions - engagedSessions", "bounces = sessions - engagedSessions",
@ -112,7 +101,6 @@ defmodule Plausible.Google.GA4.ReportRequest do
dataset: "imported_browsers", dataset: "imported_browsers",
dimensions: ["date", "browser"], dimensions: ["date", "browser"],
metrics: [ metrics: [
"screenPageViews",
"totalUsers", "totalUsers",
"sessions", "sessions",
"bounces = sessions - engagedSessions", "bounces = sessions - engagedSessions",
@ -121,9 +109,8 @@ defmodule Plausible.Google.GA4.ReportRequest do
}, },
%__MODULE__{ %__MODULE__{
dataset: "imported_operating_systems", dataset: "imported_operating_systems",
dimensions: ["date", "operatingSystem", "operatingSystemVersion"], dimensions: ["date", "operatingSystem"],
metrics: [ metrics: [
"screenPageViews",
"totalUsers", "totalUsers",
"sessions", "sessions",
"bounces = sessions - engagedSessions", "bounces = sessions - engagedSessions",

@ -26,11 +26,7 @@ defmodule Plausible.Google.UA.API do
def list_views(access_token) do def list_views(access_token) do
case UA.HTTP.list_views_for_user(access_token) do case UA.HTTP.list_views_for_user(access_token) do
{:ok, %{"items" => views}} -> {:ok, %{"items" => views}} ->
views = views = Enum.group_by(views, &view_hostname/1, &view_names/1)
views
|> Enum.group_by(&view_hostname/1, &view_names/1)
|> Enum.sort_by(fn {key, _} -> key end)
{:ok, views} {:ok, views}
error -> error ->
@ -44,19 +40,18 @@ defmodule Plausible.Google.UA.API do
Returns a single Google Analytics view if the user has access to it. Returns a single Google Analytics view if the user has access to it.
""" """
def get_view(access_token, lookup_id) do def get_view(access_token, lookup_id) do
with {:ok, views} <- list_views(access_token) do case list_views(access_token) do
views = {:ok, views} ->
views view =
|> Enum.map(&elem(&1, 1)) views
|> List.flatten() |> Map.values()
|> List.flatten()
case Enum.find(views, fn {_name, id} -> id == lookup_id end) do |> Enum.find(fn {_name, id} -> id == lookup_id end)
{view_name, view_id} ->
{:ok, %{id: view_id, name: "#{view_name}"}} {:ok, view}
nil -> {:error, cause} ->
{:error, :not_found} {:error, cause}
end
end end
end end
@ -64,10 +59,6 @@ defmodule Plausible.Google.UA.API do
UA.HTTP.get_analytics_start_date(access_token, view_id) UA.HTTP.get_analytics_start_date(access_token, view_id)
end end
def get_analytics_end_date(access_token, view_id) do
UA.HTTP.get_analytics_end_date(access_token, view_id)
end
@spec import_analytics(Date.Range.t(), String.t(), import_auth(), (String.t(), [map()] -> :ok)) :: @spec import_analytics(Date.Range.t(), String.t(), import_auth(), (String.t(), [map()] -> :ok)) ::
:ok | {:error, term()} :ok | {:error, term()}
@doc """ @doc """

@ -108,33 +108,14 @@ defmodule Plausible.Google.UA.HTTP do
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] ->
{:error, :authentication_failed} {:error, :authentication_failed}
{:error, %{reason: :timeout}} -> {:error, %HTTPClient.Non200Error{} = error} ->
{:error, :timeout} Sentry.capture_message("Error listing GA views for user", extra: %{error: error})
{:error, error} ->
Sentry.capture_message("Error listing UA views for user", extra: %{error: error})
{:error, :unknown} {:error, :unknown}
end end
end end
@earliest_valid_date "2005-01-01" @earliest_valid_date "2005-01-01"
def get_analytics_start_date(access_token, view_id) do def get_analytics_start_date(access_token, view_id) do
get_analytics_boundary_date(access_token, view_id, :start)
end
def get_analytics_end_date(access_token, view_id) do
get_analytics_boundary_date(access_token, view_id, :end)
end
defp get_analytics_boundary_date(access_token, view_id, edge) do
sort_order =
if edge == :start do
"ASCENDING"
else
"DESCENDING"
end
params = %{ params = %{
reportRequests: [ reportRequests: [
%{ %{
@ -146,7 +127,7 @@ defmodule Plausible.Google.UA.HTTP do
metrics: [%{expression: "ga:pageviews"}], metrics: [%{expression: "ga:pageviews"}],
hideTotals: true, hideTotals: true,
hideValueRanges: true, hideValueRanges: true,
orderBys: [%{fieldName: "ga:date", sortOrder: sort_order}], orderBys: [%{fieldName: "ga:date", sortOrder: "ASCENDING"}],
pageSize: 1 pageSize: 1
} }
] ]
@ -155,7 +136,7 @@ defmodule Plausible.Google.UA.HTTP do
url = "#{reporting_api_url()}/v4/reports:batchGet" url = "#{reporting_api_url()}/v4/reports:batchGet"
headers = [{"Authorization", "Bearer #{access_token}"}] headers = [{"Authorization", "Bearer #{access_token}"}]
case HTTPClient.impl().post(url, headers, params) do case HTTPClient.post(url, headers, params) do
{:ok, %Finch.Response{body: body, status: 200}} -> {:ok, %Finch.Response{body: body, status: 200}} ->
report = List.first(body["reports"]) report = List.first(body["reports"])
@ -170,18 +151,13 @@ defmodule Plausible.Google.UA.HTTP do
{:ok, date} {:ok, date}
{:error, %HTTPClient.Non200Error{} = error} when error.reason.status in [401, 403] -> {:error, %{reason: %Finch.Response{body: body}}} ->
{:error, :authentication_failed} Sentry.capture_message("Error fetching UA start date", extra: %{body: inspect(body)})
{:error, body}
{:error, %{reason: :timeout}} ->
{:error, :timeout}
{:error, error} ->
Sentry.capture_message("Error retrieving UA #{edge} date",
extra: %{error: error}
)
{:error, :unknown} {:error, %{reason: reason} = e} ->
Sentry.capture_message("Error fetching UA start date", extra: %{error: inspect(e)})
{:error, reason}
end end
end end

@ -37,9 +37,6 @@ defmodule Plausible.Imported do
# Maximum number of complete imports to account for when querying stats # Maximum number of complete imports to account for when querying stats
@max_complete_imports 5 @max_complete_imports 5
@spec schemas() :: [module()]
def schemas, do: @tables
@spec tables() :: [String.t()] @spec tables() :: [String.t()]
def tables, do: @table_names def tables, do: @table_names
@ -51,29 +48,28 @@ defmodule Plausible.Imported do
def load_import_data(site) do def load_import_data(site) do
complete_import_ids = list_complete_import_ids(site) complete_import_ids = list_complete_import_ids(site)
dates = get_imports_date_range(site) earliest_import = get_earliest_import(site) || %{}
%{ %{
site site
| import_data_loaded: true, | import_data_loaded: true,
earliest_import_start_date: dates.start_date, earliest_import_start_date: Map.get(earliest_import, :start_date),
latest_import_end_date: dates.end_date, earliest_import_end_date: Map.get(earliest_import, :end_date),
complete_import_ids: complete_import_ids complete_import_ids: complete_import_ids
} }
end end
@spec get_import(Site.t(), non_neg_integer()) :: SiteImport.t() | nil @spec get_import(non_neg_integer()) :: SiteImport.t() | nil
def get_import(site, import_id) do def get_import(import_id) do
Repo.get_by(SiteImport, id: import_id, site_id: site.id) Repo.get(SiteImport, import_id)
end end
defdelegate listen(), to: Imported.Importer defdelegate listen(), to: Imported.Importer
@spec list_all_imports(Site.t(), atom()) :: [SiteImport.t()] @spec list_all_imports(Site.t()) :: [SiteImport.t()]
def list_all_imports(site, status \\ nil) do def list_all_imports(site) do
imports = imports =
from(i in SiteImport, where: i.site_id == ^site.id, order_by: [desc: i.inserted_at]) from(i in SiteImport, where: i.site_id == ^site.id, order_by: [desc: i.inserted_at])
|> maybe_filter_by_status(status)
|> Repo.all() |> Repo.all()
if site.imported_data && not Enum.any?(imports, & &1.legacy) do if site.imported_data && not Enum.any?(imports, & &1.legacy) do
@ -83,72 +79,42 @@ defmodule Plausible.Imported do
end end
end end
@spec other_imports_in_progress?(SiteImport.t()) :: boolean()
def other_imports_in_progress?(site_import) do
Repo.exists?(
from(i in SiteImport,
where: i.site_id == ^site_import.site_id and i.id != ^site_import.id,
where: i.status in ^[SiteImport.pending(), SiteImport.importing()]
)
)
end
defp maybe_filter_by_status(query, nil), do: query
defp maybe_filter_by_status(query, status) do
where(query, [i], i.status == ^status)
end
@spec list_complete_import_ids(Site.t()) :: [non_neg_integer()] @spec list_complete_import_ids(Site.t()) :: [non_neg_integer()]
def list_complete_import_ids(site) do def list_complete_import_ids(site) do
ids = ids =
from(i in SiteImport, from(i in SiteImport,
where: i.site_id == ^site.id and i.status == ^SiteImport.completed(), where: i.site_id == ^site.id and i.status == ^SiteImport.completed(),
select: {i.legacy, i.id}, select: i.id,
limit: @max_complete_imports limit: @max_complete_imports
) )
|> Repo.all() |> Repo.all()
has_legacy? = Enum.any?(ids, fn {legacy?, _} -> legacy? end)
ids = Enum.map(ids, &elem(&1, 1))
# account for legacy imports as well # account for legacy imports as well
if has_legacy? || (site.imported_data && site.imported_data.status == "ok") do if site.imported_data && site.imported_data.status == "ok" do
[0 | ids] [0 | ids]
else else
ids ids
end end
end end
@spec get_imports_date_range(Site.t()) :: %{ @spec get_earliest_import(Site.t()) :: SiteImport.t() | nil
start_date: Date.t() | nil, def get_earliest_import(site) do
end_date: Date.t() | nil first_import =
}
def get_imports_date_range(site) do
dates =
from(i in SiteImport, from(i in SiteImport,
where: i.site_id == ^site.id and i.status == ^SiteImport.completed(), where: i.site_id == ^site.id and i.status == ^SiteImport.completed(),
select: %{start_date: min(i.start_date), end_date: max(i.end_date)} order_by: i.start_date,
limit: 1
) )
|> Repo.one() |> Repo.one()
dates = dates || %{start_date: nil, end_date: nil} legacy_import =
if site.imported_data && site.imported_data.status == "ok" do
if site.imported_data && site.imported_data.status == "ok" do site.imported_data
start_date = end
[dates.start_date, site.imported_data.start_date]
|> Enum.reject(&is_nil/1)
|> Enum.min(Date, fn -> nil end)
end_date =
[dates.end_date, site.imported_data.end_date]
|> Enum.reject(&is_nil/1)
|> Enum.max(Date, fn -> nil end)
%{start_date: start_date, end_date: end_date} [legacy_import, first_import]
else |> Enum.reject(&is_nil/1)
dates |> Enum.min_by(& &1.start_date, Date, fn -> nil end)
end
end end
@spec delete_imports_for_site(Site.t()) :: :ok @spec delete_imports_for_site(Site.t()) :: :ok
@ -157,66 +123,4 @@ defmodule Plausible.Imported do
:ok :ok
end end
@spec check_dates(Site.t(), Date.t() | nil, Date.t() | nil) ::
{:ok, Date.t(), Date.t()} | {:error, :no_data | :no_time_window}
def check_dates(_site, nil, _end_date), do: {:error, :no_data}
def check_dates(site, start_date, end_date) do
cutoff_date = Plausible.Sites.native_stats_start_date(site) || Timex.today(site.timezone)
end_date = Enum.min([end_date, cutoff_date], Date)
with true <- Date.diff(end_date, start_date) >= 2,
[_ | _] = free_ranges <- find_free_ranges(start_date, end_date, site) do
longest = Enum.max_by(free_ranges, &Date.diff(&1.last, &1.first))
{:ok, longest.first, longest.last}
else
_ -> {:error, :no_time_window}
end
end
defp find_free_ranges(start_date, end_date, site) do
occupied_ranges =
site
|> Imported.list_all_imports(Imported.SiteImport.completed())
|> Enum.reject(&(Date.diff(&1.end_date, &1.start_date) < 2))
|> Enum.map(&Date.range(&1.start_date, &1.end_date))
Date.range(start_date, end_date)
|> free_ranges(start_date, occupied_ranges, [])
end
# This function recursively finds open ranges that are not yet occupied
# by existing imported data. The idea is that we keep moving a dynamic
# date index `d` from start until the end of `imported_range`, hopping
# over each occupied range, and capturing the open ranges step-by-step
# in the `result` array.
defp free_ranges(import_range, d, [occupied_range | rest_of_occupied_ranges], result) do
cond do
Date.diff(occupied_range.last, d) <= 0 ->
free_ranges(import_range, d, rest_of_occupied_ranges, result)
in_range?(d, occupied_range) || Date.diff(occupied_range.first, d) < 2 ->
d = occupied_range.last
free_ranges(import_range, d, rest_of_occupied_ranges, result)
true ->
free_range = Date.range(d, occupied_range.first)
result = result ++ [free_range]
d = occupied_range.last
free_ranges(import_range, d, rest_of_occupied_ranges, result)
end
end
defp free_ranges(import_range, d, [], result) do
if Date.diff(import_range.last, d) < 2 do
result
else
result ++ [Date.range(d, import_range.last)]
end
end
defp in_range?(date, range) do
Date.before?(range.first, date) && Date.after?(range.last, date)
end
end end

@ -8,11 +8,9 @@ defmodule Plausible.Imported.Browser do
field :import_id, Ch, type: "UInt64" field :import_id, Ch, type: "UInt64"
field :date, :date field :date, :date
field :browser, :string field :browser, :string
field :browser_version, :string
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :visits, Ch, type: "UInt64" field :visits, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :visit_duration, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32" field :bounces, Ch, type: "UInt32"
end end
end end

@ -20,13 +20,7 @@ defmodule Plausible.Imported.CSVImporter do
@impl true @impl true
def import_data(site_import, opts) do def import_data(site_import, opts) do
%{ %{id: import_id, site_id: site_id} = site_import
id: import_id,
site_id: site_id,
start_date: start_date,
end_date: end_date
} = site_import
uploads = Keyword.fetch!(opts, :uploads) uploads = Keyword.fetch!(opts, :uploads)
%{access_key_id: s3_access_key_id, secret_access_key: s3_secret_access_key} = %{access_key_id: s3_access_key_id, secret_access_key: s3_secret_access_key} =
@ -37,44 +31,52 @@ defmodule Plausible.Imported.CSVImporter do
|> Keyword.replace!(:pool_size, 1) |> Keyword.replace!(:pool_size, 1)
|> Ch.start_link() |> Ch.start_link()
Enum.each(uploads, fn upload -> ranges =
%{"filename" => filename, "s3_url" => s3_url} = upload Enum.map(uploads, fn upload ->
%{"filename" => filename, "s3_url" => s3_url} = upload
{table, _, _} = parse_filename!(filename)
s3_structure = input_structure!(table) ".csv" = Path.extname(filename)
table = Path.rootname(filename)
s3_structure_cols_expr = ensure_importable_table!(table)
s3_structure
|> String.split(",", trim: true) s3_structure = input_structure!(table)
|> Enum.map_join(", ", fn kv ->
[col, _type] = String.split(kv) statement =
col """
end) INSERT INTO {table:Identifier} \
SELECT {site_id:UInt64} AS site_id, *, {import_id:UInt64} AS import_id \
statement = FROM s3({s3_url:String},{s3_access_key_id:String},{s3_secret_access_key:String},{s3_format:String},{s3_structure:String})\
""" """
INSERT INTO {table:Identifier}(site_id, #{s3_structure_cols_expr}, import_id) \
SELECT {site_id:UInt64} AS site_id, *, {import_id:UInt64} AS import_id \ params =
FROM s3({s3_url:String},{s3_access_key_id:String},{s3_secret_access_key:String},{s3_format:String},{s3_structure:String}) \ %{
WHERE date >= {start_date:Date} AND date <= {end_date:Date}\ "table" => table,
""" "site_id" => site_id,
"import_id" => import_id,
params = "s3_url" => s3_url,
%{ "s3_access_key_id" => s3_access_key_id,
"table" => table, "s3_secret_access_key" => s3_secret_access_key,
"site_id" => site_id, "s3_format" => "CSVWithNames",
"import_id" => import_id, "s3_structure" => s3_structure
"s3_url" => s3_url, }
"s3_access_key_id" => s3_access_key_id,
"s3_secret_access_key" => s3_secret_access_key, Ch.query!(ch, statement, params, timeout: :infinity)
"s3_format" => "CSVWithNames",
"s3_structure" => s3_structure, %Ch.Result{rows: [[min_date, max_date]]} =
"start_date" => start_date, Ch.query!(
"end_date" => end_date ch,
} "SELECT min(date), max(date) FROM {table:Identifier} WHERE site_id = {site_id:UInt64} AND import_id = {import_id:UInt64}",
%{"table" => table, "site_id" => site_id, "import_id" => import_id}
Ch.query!(ch, statement, params, timeout: :infinity) )
end)
Date.range(min_date, max_date)
end)
{:ok,
%{
start_date: Enum.min_by(ranges, & &1.first, Date).first,
end_date: Enum.max_by(ranges, & &1.last, Date).last
}}
rescue rescue
# we are cancelling on any argument or ClickHouse errors # we are cancelling on any argument or ClickHouse errors
e in [ArgumentError, Ch.Error] -> e in [ArgumentError, Ch.Error] ->
@ -83,147 +85,30 @@ defmodule Plausible.Imported.CSVImporter do
input_structures = %{ input_structures = %{
"imported_browsers" => "imported_browsers" =>
"date Date, browser String, browser_version String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32, pageviews UInt64", "date Date, browser String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32",
"imported_devices" => "imported_devices" =>
"date Date, device String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32, pageviews UInt64", "date Date, device String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32",
"imported_entry_pages" => "imported_entry_pages" =>
"date Date, entry_page String, visitors UInt64, entrances UInt64, visit_duration UInt64, bounces UInt32, pageviews UInt64", "date Date, entry_page String, visitors UInt64, entrances UInt64, visit_duration UInt64, bounces UInt32",
"imported_exit_pages" => "imported_exit_pages" => "date Date, exit_page String, visitors UInt64, exits UInt64",
"date Date, exit_page String, visitors UInt64, visit_duration UInt64, exits UInt64, bounces UInt32, pageviews UInt64",
"imported_locations" => "imported_locations" =>
"date Date, country String, region String, city UInt64, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32, pageviews UInt64", "date Date, country String, region String, city UInt64, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32",
"imported_operating_systems" => "imported_operating_systems" =>
"date Date, operating_system String, operating_system_version String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32, pageviews UInt64", "date Date, operating_system String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32",
"imported_pages" => "imported_pages" =>
"date Date, hostname String, page String, visits UInt64, visitors UInt64, pageviews UInt64, exits UInt64, time_on_page UInt64", "date Date, hostname String, page String, visitors UInt64, pageviews UInt64, exits UInt64, time_on_page UInt64",
"imported_sources" => "imported_sources" =>
"date Date, source String, referrer String, utm_source String, utm_medium String, utm_campaign String, utm_content String, utm_term String, pageviews UInt64, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32", "date Date, source String, utm_medium String, utm_campaign String, utm_content String, utm_term String, visitors UInt64, visits UInt64, visit_duration UInt64, bounces UInt32",
"imported_visitors" => "imported_visitors" =>
"date Date, visitors UInt64, pageviews UInt64, bounces UInt64, visits UInt64, visit_duration UInt64" "date Date, visitors UInt64, pageviews UInt64, bounces UInt64, visits UInt64, visit_duration UInt64"
} }
@doc """
Extracts min/max date range from a list of uploads.
Examples:
iex> date_range([
...> %{"filename" => "imported_devices_20190101_20210101.csv"},
...> "imported_pages_20200101_20220101.csv"
...> ])
Date.range(~D[2019-01-01], ~D[2022-01-01])
iex> date_range([])
nil
"""
@spec date_range([String.t() | %{String.t() => String.t()}, ...]) :: Date.Range.t() | nil
def date_range([_ | _] = uploads), do: date_range(uploads, _start_date = nil, _end_date = nil)
def date_range([]), do: nil
defp date_range([upload | uploads], prev_start_date, prev_end_date) do
filename =
case upload do
%{"filename" => filename} -> filename
filename when is_binary(filename) -> filename
end
{_table, start_date, end_date} = parse_filename!(filename)
start_date =
if prev_start_date do
Enum.min([start_date, prev_start_date], Date)
else
start_date
end
end_date =
if prev_end_date do
Enum.max([end_date, prev_end_date], Date)
else
end_date
end
date_range(uploads, start_date, end_date)
end
defp date_range([], first, last), do: Date.range(first, last)
@spec parse_date!(String.t()) :: Date.t()
defp parse_date!(date) do
date |> Timex.parse!("{YYYY}{0M}{0D}") |> NaiveDateTime.to_date()
end
@doc """
Extracts table name and min/max dates from the filename.
Examples:
iex> parse_filename!("my_data.csv")
** (ArgumentError) invalid filename
iex> parse_filename!("imported_devices_00010101_20250101.csv")
{"imported_devices", ~D[0001-01-01], ~D[2025-01-01]}
"""
@spec parse_filename!(String.t()) ::
{table :: String.t(), start_date :: Date.t(), end_date :: Date.t()}
def parse_filename!(filename)
for {table, input_structure} <- input_structures do for {table, input_structure} <- input_structures do
defp input_structure!(unquote(table)), do: unquote(input_structure) defp input_structure!(unquote(table)), do: unquote(input_structure)
defp ensure_importable_table!(unquote(table)), do: :ok
def parse_filename!(
<<unquote(table)::bytes, ?_, start_date::8-bytes, ?_, end_date::8-bytes, ".csv">>
) do
{unquote(table), parse_date!(start_date), parse_date!(end_date)}
end
end
def parse_filename!(_filename) do
raise ArgumentError, "invalid filename"
end
@doc """
Checks if the provided filename conforms to the expected format.
Examples:
iex> valid_filename?("my_data.csv")
false
iex> valid_filename?("imported_devices_00010101_20250101.csv")
true
"""
@spec valid_filename?(String.t()) :: boolean
def valid_filename?(filename) do
try do
parse_filename!(filename)
else
_ -> true
rescue
_ -> false
end
end end
@doc """ defp ensure_importable_table!(table) do
Extracts the table name from the provided filename. raise ArgumentError, "table #{table} is not supported for data import"
Raises if the filename doesn't conform to the expected format.
Examples:
iex> extract_table("my_data.csv")
** (ArgumentError) invalid filename
iex> extract_table("imported_devices_00010101_20250101.csv")
"imported_devices"
"""
@spec extract_table(String.t()) :: String.t()
def extract_table(filename) do
{table, _start_date, _end_date} = parse_filename!(filename)
table
end end
end end

@ -11,7 +11,6 @@ defmodule Plausible.Imported.Device do
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :visits, Ch, type: "UInt64" field :visits, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :visit_duration, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32" field :bounces, Ch, type: "UInt32"
end end
end end

@ -11,7 +11,6 @@ defmodule Plausible.Imported.EntryPage do
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :entrances, Ch, type: "UInt64" field :entrances, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :visit_duration, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32" field :bounces, Ch, type: "UInt32"
end end
end end

@ -8,10 +8,7 @@ defmodule Plausible.Imported.ExitPage do
field :import_id, Ch, type: "UInt64" field :import_id, Ch, type: "UInt64"
field :date, :date field :date, :date
field :exit_page, :string field :exit_page, :string
field :exits, Ch, type: "UInt64"
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :exits, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32"
end end
end end

@ -96,28 +96,17 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
end end
defp new_from_report(site_id, import_id, "imported_sources", row) do defp new_from_report(site_id, import_id, "imported_sources", row) do
referrer_uri = row.dimensions |> Map.fetch!("pageReferrer") |> URI.parse()
referrer =
if PlausibleWeb.RefInspector.right_uri?(referrer_uri) do
PlausibleWeb.RefInspector.format_referrer(referrer_uri)
end
%{ %{
site_id: site_id, site_id: site_id,
import_id: import_id, import_id: import_id,
date: get_date(row), date: get_date(row),
source: row.dimensions |> Map.fetch!("sessionSource") |> parse_referrer(), source: row.dimensions |> Map.fetch!("sessionSource") |> parse_referrer(),
referrer: referrer,
# Only `source` exists in GA4 API
utm_source: nil,
utm_medium: row.dimensions |> Map.fetch!("sessionMedium") |> default_if_missing(), utm_medium: row.dimensions |> Map.fetch!("sessionMedium") |> default_if_missing(),
utm_campaign: row.dimensions |> Map.fetch!("sessionCampaignName") |> default_if_missing(), utm_campaign: row.dimensions |> Map.fetch!("sessionCampaignName") |> default_if_missing(),
utm_content: row.dimensions |> Map.fetch!("sessionManualAdContent") |> default_if_missing(), utm_content: row.dimensions |> Map.fetch!("sessionManualAdContent") |> default_if_missing(),
utm_term: row.dimensions |> Map.fetch!("sessionGoogleAdsKeyword") |> default_if_missing(), utm_term: row.dimensions |> Map.fetch!("sessionGoogleAdsKeyword") |> default_if_missing(),
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(),
visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number()
} }
@ -131,7 +120,6 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
hostname: row.dimensions |> Map.fetch!("hostName") |> String.replace_prefix("www.", ""), hostname: row.dimensions |> Map.fetch!("hostName") |> String.replace_prefix("www.", ""),
page: row.dimensions |> Map.fetch!("pagePath") |> URI.parse() |> Map.get(:path), page: row.dimensions |> Map.fetch!("pagePath") |> URI.parse() |> Map.get(:path),
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
visits: row.metrics |> Map.fetch!("sessions") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
# NOTE: no exits metric in GA4 API currently # NOTE: no exits metric in GA4 API currently
exits: 0, exits: 0,
@ -148,7 +136,6 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
entrances: row.metrics |> Map.fetch!("sessions") |> parse_number(), entrances: row.metrics |> Map.fetch!("sessions") |> parse_number(),
visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
bounces: row.metrics |> Map.fetch!("bounces") |> parse_number() bounces: row.metrics |> Map.fetch!("bounces") |> parse_number()
} }
end end
@ -161,10 +148,7 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
# date: get_date(row), # date: get_date(row),
# exit_page: Map.fetch!(row.dimensions, "exitPage"), # exit_page: Map.fetch!(row.dimensions, "exitPage"),
# visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), # visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
# exits: row.metrics |> Map.fetch!("sessions") |> parse_number(), # exits: row.metrics |> Map.fetch!("sessions") |> parse_number()
# visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number(),
# pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
# bounces: row.metrics |> Map.fetch!("bounces") |> parse_number()
# } # }
# end # end
@ -182,7 +166,6 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
city: city_data && city_data.id, city: city_data && city_data.id,
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(),
visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number()
} }
@ -196,7 +179,6 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
device: row.dimensions |> Map.fetch!("deviceCategory") |> String.capitalize(), device: row.dimensions |> Map.fetch!("deviceCategory") |> String.capitalize(),
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(),
visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number()
} }
@ -220,11 +202,8 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
import_id: import_id, import_id: import_id,
date: get_date(row), date: get_date(row),
browser: Map.get(@browser_google_to_plausible, browser, browser), browser: Map.get(@browser_google_to_plausible, browser, browser),
# Does not exist in GA4 API
browser_version: nil,
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(),
visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number()
} }
@ -244,10 +223,8 @@ defmodule Plausible.Imported.GoogleAnalytics4 do
import_id: import_id, import_id: import_id,
date: get_date(row), date: get_date(row),
operating_system: Map.get(@os_google_to_plausible, os, os), operating_system: Map.get(@os_google_to_plausible, os, os),
operating_system_version: row.dimensions |> Map.fetch!("operatingSystemVersion"),
visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(),
visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(),
pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(),
bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(),
visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number()
} }

@ -91,7 +91,6 @@ defmodule Plausible.Imported.Importer do
like LiveView, where notifications can be listened for via `handle_info/2`. like LiveView, where notifications can be listened for via `handle_info/2`.
""" """
alias Plausible.Imported
alias Plausible.Imported.SiteImport alias Plausible.Imported.SiteImport
alias Plausible.Repo alias Plausible.Repo
@ -99,7 +98,7 @@ defmodule Plausible.Imported.Importer do
@callback label() :: String.t() @callback label() :: String.t()
@callback email_template() :: String.t() @callback email_template() :: String.t()
@callback parse_args(map()) :: Keyword.t() @callback parse_args(map()) :: Keyword.t()
@callback import_data(SiteImport.t(), Keyword.t()) :: :ok | {:error, any()} @callback import_data(Plausible.Imported.SiteImport.t(), Keyword.t()) :: :ok | {:error, any()}
@callback before_start(SiteImport.t()) :: :ok | {:ok, map()} | {:error, any()} @callback before_start(SiteImport.t()) :: :ok | {:ok, map()} | {:error, any()}
@callback on_success(SiteImport.t(), map()) :: :ok @callback on_success(SiteImport.t(), map()) :: :ok
@callback on_failure(SiteImport.t()) :: :ok @callback on_failure(SiteImport.t()) :: :ok
@ -109,7 +108,7 @@ defmodule Plausible.Imported.Importer do
@behaviour Plausible.Imported.Importer @behaviour Plausible.Imported.Importer
@spec new_import(Plausible.Site.t(), Plausible.Auth.User.t(), Keyword.t()) :: @spec new_import(Plausible.Site.t(), Plausible.Auth.User.t(), Keyword.t()) ::
{:ok, Oban.Job.t()} | {:error, Ecto.Changeset.t() | :import_in_progress} {:ok, Oban.Job.t()} | {:error, Ecto.Changeset.t()}
def new_import(site, user, opts) do def new_import(site, user, opts) do
Plausible.Imported.Importer.new_import(name(), site, user, opts, &before_start/1) Plausible.Imported.Importer.new_import(name(), site, user, opts, &before_start/1)
end end
@ -156,7 +155,7 @@ defmodule Plausible.Imported.Importer do
def new_import(source, site, user, opts, before_start_fun) do def new_import(source, site, user, opts, before_start_fun) do
import_params = import_params =
opts opts
|> Keyword.take([:label, :start_date, :end_date, :legacy]) |> Keyword.take([:start_date, :end_date, :legacy])
|> Keyword.put(:source, source) |> Keyword.put(:source, source)
|> Map.new() |> Map.new()
@ -223,15 +222,11 @@ defmodule Plausible.Imported.Importer do
:ok = listen() :ok = listen()
end end
if not Imported.other_imports_in_progress?(site_import) do opts
opts |> Keyword.put(:import_id, site_import.id)
|> Keyword.put(:import_id, site_import.id) |> Map.new()
|> Map.new() |> Plausible.Workers.ImportAnalytics.new()
|> Plausible.Workers.ImportAnalytics.new() |> Oban.insert()
|> Oban.insert()
else
{:error, :import_in_progress}
end
end end
defp mark_complete(site_import, extra_data, on_success_fun) do defp mark_complete(site_import, extra_data, on_success_fun) do

@ -13,7 +13,6 @@ defmodule Plausible.Imported.Location do
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :visits, Ch, type: "UInt64" field :visits, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :visit_duration, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32" field :bounces, Ch, type: "UInt32"
end end
end end

@ -8,11 +8,9 @@ defmodule Plausible.Imported.OperatingSystem do
field :import_id, Ch, type: "UInt64" field :import_id, Ch, type: "UInt64"
field :date, :date field :date, :date
field :operating_system, :string field :operating_system, :string
field :operating_system_version, :string
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :visits, Ch, type: "UInt64" field :visits, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :visit_duration, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32" field :bounces, Ch, type: "UInt32"
end end
end end

@ -9,7 +9,6 @@ defmodule Plausible.Imported.Page do
field :date, :date field :date, :date
field :hostname, :string field :hostname, :string
field :page, :string field :page, :string
field :visits, Ch, type: "UInt64"
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64" field :pageviews, Ch, type: "UInt64"
field :exits, Ch, type: "UInt64" field :exits, Ch, type: "UInt64"

@ -18,7 +18,6 @@ defmodule Plausible.Imported.SiteImport do
schema "site_imports" do schema "site_imports" do
field :start_date, :date field :start_date, :date
field :end_date, :date field :end_date, :date
field :label, :string
field :source, Ecto.Enum, values: ImportSources.names() field :source, Ecto.Enum, values: ImportSources.names()
field :status, Ecto.Enum, values: @statuses field :status, Ecto.Enum, values: @statuses
field :legacy, :boolean, default: false field :legacy, :boolean, default: false
@ -33,14 +32,11 @@ defmodule Plausible.Imported.SiteImport do
defmacro unquote(status)(), do: unquote(status) defmacro unquote(status)(), do: unquote(status)
end end
@spec label(t() | Site.ImportedData.t()) :: String.t()
def label(%__MODULE__{source: source, label: label}) do
build_label(ImportSources.by_name(source).label(), label)
end
# NOTE: this is necessary for backwards compatibility # NOTE: this is necessary for backwards compatibility
# with legacy imports # with legacy imports
def label(%Site.ImportedData{source: source}), do: build_label(source, nil) @spec label(t() | Site.ImportedData.t()) :: String.t()
def label(%__MODULE__{source: source}), do: ImportSources.by_name(source).label()
def label(%Site.ImportedData{source: source}), do: source
@spec from_legacy(Site.ImportedData.t()) :: t() @spec from_legacy(Site.ImportedData.t()) :: t()
def from_legacy(%Site.ImportedData{} = data) do def from_legacy(%Site.ImportedData{} = data) do
@ -64,7 +60,7 @@ defmodule Plausible.Imported.SiteImport do
@spec create_changeset(Site.t(), User.t(), map()) :: Ecto.Changeset.t() @spec create_changeset(Site.t(), User.t(), map()) :: Ecto.Changeset.t()
def create_changeset(site, user, params) do def create_changeset(site, user, params) do
%__MODULE__{} %__MODULE__{}
|> cast(params, [:label, :source, :start_date, :end_date, :legacy]) |> cast(params, [:source, :start_date, :end_date, :legacy])
|> validate_required([:source]) |> validate_required([:source])
|> put_assoc(:site, site) |> put_assoc(:site, site)
|> put_assoc(:imported_by, user) |> put_assoc(:imported_by, user)
@ -89,7 +85,4 @@ defmodule Plausible.Imported.SiteImport do
def fail_changeset(site_import) do def fail_changeset(site_import) do
change(site_import, status: failed()) change(site_import, status: failed())
end end
defp build_label(source, nil), do: source
defp build_label(source, label), do: "#{source} (#{label})"
end end

@ -8,8 +8,6 @@ defmodule Plausible.Imported.Source do
field :import_id, Ch, type: "UInt64" field :import_id, Ch, type: "UInt64"
field :date, :date field :date, :date
field :source, :string field :source, :string
field :referrer, :string
field :utm_source, :string
field :utm_medium, :string field :utm_medium, :string
field :utm_campaign, :string field :utm_campaign, :string
field :utm_content, :string field :utm_content, :string
@ -17,7 +15,6 @@ defmodule Plausible.Imported.Source do
field :visitors, Ch, type: "UInt64" field :visitors, Ch, type: "UInt64"
field :visits, Ch, type: "UInt64" field :visits, Ch, type: "UInt64"
field :visit_duration, Ch, type: "UInt64" field :visit_duration, Ch, type: "UInt64"
field :pageviews, Ch, type: "UInt64"
field :bounces, Ch, type: "UInt32" field :bounces, Ch, type: "UInt32"
end end
end end

@ -29,7 +29,6 @@ defmodule Plausible.Ingestion.Event do
| :dc_ip | :dc_ip
| :site_ip_blocklist | :site_ip_blocklist
| :site_country_blocklist | :site_country_blocklist
| :site_page_blocklist
@type t() :: %__MODULE__{ @type t() :: %__MODULE__{
domain: String.t() | nil, domain: String.t() | nil,
@ -44,6 +43,26 @@ defmodule Plausible.Ingestion.Event do
changeset: %Ecto.Changeset{} changeset: %Ecto.Changeset{}
} }
@session_properties [
:session_id,
:referrer,
:referrer_source,
:utm_medium,
:utm_source,
:utm_campaign,
:utm_content,
:utm_term,
:country_code,
:subdivision1_code,
:subdivision2_code,
:city_geoname_id,
:screen_size,
:operating_system,
:operating_system_version,
:browser,
:browser_version
]
@spec build_and_buffer(Request.t()) :: {:ok, %{buffered: [t()], dropped: [t()]}} @spec build_and_buffer(Request.t()) :: {:ok, %{buffered: [t()], dropped: [t()]}}
def build_and_buffer(%Request{domains: domains} = request) do def build_and_buffer(%Request{domains: domains} = request) do
processed_events = processed_events =
@ -80,10 +99,6 @@ defmodule Plausible.Ingestion.Event do
[:plausible, :ingest, :event, :dropped] [:plausible, :ingest, :event, :dropped]
end end
def telemetry_pipeline_step_duration() do
[:plausible, :ingest, :pipeline, :step]
end
@spec emit_telemetry_buffered(t()) :: :ok @spec emit_telemetry_buffered(t()) :: :ok
def emit_telemetry_buffered(event) do def emit_telemetry_buffered(event) do
:telemetry.execute(telemetry_event_buffered(), %{}, %{ :telemetry.execute(telemetry_event_buffered(), %{}, %{
@ -103,42 +118,33 @@ defmodule Plausible.Ingestion.Event do
defp pipeline() do defp pipeline() do
[ [
drop_datacenter_ip: &drop_datacenter_ip/1, &drop_datacenter_ip/1,
drop_shield_rule_page: &drop_shield_rule_page/1, &drop_shield_rule_ip/1,
drop_shield_rule_ip: &drop_shield_rule_ip/1, &put_geolocation/1,
put_geolocation: &put_geolocation/1, &drop_shield_rule_country/1,
drop_shield_rule_country: &drop_shield_rule_country/1, &put_user_agent/1,
put_user_agent: &put_user_agent/1, &put_basic_info/1,
put_basic_info: &put_basic_info/1, &put_referrer/1,
put_referrer: &put_referrer/1, &put_utm_tags/1,
put_utm_tags: &put_utm_tags/1, &put_props/1,
put_props: &put_props/1, &put_revenue/1,
put_revenue: &put_revenue/1, &put_salts/1,
put_salts: &put_salts/1, &put_user_id/1,
put_user_id: &put_user_id/1, &validate_clickhouse_event/1,
validate_clickhouse_event: &validate_clickhouse_event/1, &register_session/1,
register_session: &register_session/1, &write_to_buffer/1
write_to_buffer: &write_to_buffer/1
] ]
end end
defp process_unless_dropped(%__MODULE__{} = initial_event, pipeline) do defp process_unless_dropped(%__MODULE__{} = initial_event, pipeline) do
Enum.reduce_while(pipeline, initial_event, fn {step_name, step_fn}, acc_event -> Enum.reduce_while(pipeline, initial_event, fn pipeline_step, acc_event ->
Plausible.PromEx.Plugins.PlausibleMetrics.measure_duration( case pipeline_step.(acc_event) do
telemetry_pipeline_step_duration(), %__MODULE__{dropped?: true} = dropped -> {:halt, dropped}
fn -> execute_step(step_fn, acc_event) end, %__MODULE__{dropped?: false} = event -> {:cont, event}
%{step: "#{step_name}"} end
)
end) end)
end end
defp execute_step(step_fn, acc_event) do
case step_fn.(acc_event) do
%__MODULE__{dropped?: true} = dropped -> {:halt, dropped}
%__MODULE__{dropped?: false} = event -> {:cont, event}
end
end
defp new(domain, request) do defp new(domain, request) do
struct!(__MODULE__, domain: domain, request: request) struct!(__MODULE__, domain: domain, request: request)
end end
@ -176,18 +182,15 @@ defmodule Plausible.Ingestion.Event do
end end
defp drop_shield_rule_ip(%__MODULE__{} = event) do defp drop_shield_rule_ip(%__MODULE__{} = event) do
if Plausible.Shields.ip_blocked?(event.domain, event.request.remote_ip) do domain = event.domain
drop(event, :site_ip_blocklist) address = event.request.remote_ip
else
event
end
end
defp drop_shield_rule_page(%__MODULE__{} = event) do case Plausible.Shield.IPRuleCache.get({domain, address}) do
if Plausible.Shields.page_blocked?(event.domain, event.request.pathname) do %Plausible.Shield.IPRule{action: :deny} ->
drop(event, :site_page_blocklist) drop(event, :site_ip_blocklist)
else
event _ ->
event
end end
end end
@ -260,10 +263,12 @@ defmodule Plausible.Ingestion.Event do
%__MODULE__{domain: domain, clickhouse_session_attrs: %{country_code: cc}} = event %__MODULE__{domain: domain, clickhouse_session_attrs: %{country_code: cc}} = event
) )
when is_binary(domain) and is_binary(cc) do when is_binary(domain) and is_binary(cc) do
if Plausible.Shields.country_blocked?(domain, cc) do case Plausible.Shield.CountryRuleCache.get({domain, String.upcase(cc)}) do
drop(event, :site_country_blocklist) %Plausible.Shield.CountryRule{action: :deny} ->
else drop(event, :site_country_blocklist)
event
_ ->
event
end end
end end
@ -339,7 +344,8 @@ defmodule Plausible.Ingestion.Event do
%{ %{
event event
| clickhouse_event: ClickhouseEventV2.merge_session(event.clickhouse_event, session) | clickhouse_event:
Map.merge(event.clickhouse_event, Map.take(session, @session_properties))
} }
end end
@ -375,7 +381,9 @@ defmodule Plausible.Ingestion.Event do
uri = URI.parse(ref.referer) uri = URI.parse(ref.referer)
if PlausibleWeb.RefInspector.right_uri?(uri) do if PlausibleWeb.RefInspector.right_uri?(uri) do
PlausibleWeb.RefInspector.format_referrer(uri) host = String.replace_prefix(uri.host, "www.", "")
path = uri.path || ""
host <> String.trim_trailing(path, "/")
end end
end end

@ -3,79 +3,6 @@ defmodule Plausible.S3 do
Helper functions for S3 exports/imports. Helper functions for S3 exports/imports.
""" """
@doc """
Returns the pre-configured S3 bucket for CSV exports.
config :plausible, Plausible.S3,
exports_bucket: System.fetch_env!("S3_EXPORTS_BUCKET")
Example:
iex> exports_bucket()
"test-exports"
"""
@spec exports_bucket :: String.t()
def exports_bucket, do: config(:exports_bucket)
@doc """
Returns the pre-configured S3 bucket for CSV imports.
config :plausible, Plausible.S3,
imports_bucket: System.fetch_env!("S3_IMPORTS_BUCKET")
Example:
iex> imports_bucket()
"test-imports"
"""
@spec imports_bucket :: String.t()
def imports_bucket, do: config(:imports_bucket)
defp config, do: Application.fetch_env!(:plausible, __MODULE__)
defp config(key), do: Keyword.fetch!(config(), key)
@doc """
Presigns an upload for an imported file.
In the current implementation the bucket always goes into the path component.
Example:
iex> %{
...> s3_url: "http://localhost:10000/test-imports/123/imported_browsers.csv",
...> presigned_url: "http://localhost:10000/test-imports/123/imported_browsers.csv?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin" <> _
...> } = import_presign_upload(_site_id = 123, _filename = "imported_browsers.csv")
"""
def import_presign_upload(site_id, filename) do
config = ExAws.Config.new(:s3)
s3_path = Path.join(to_string(site_id), filename)
bucket = imports_bucket()
{:ok, presigned_url} = ExAws.S3.presigned_url(config, :put, bucket, s3_path)
%{s3_url: extract_s3_url(presigned_url), presigned_url: presigned_url}
end
# to make ClickHouse see MinIO in dev and test envs we replace
# the host in the S3 URL with whatever's set in S3_CLICKHOUSE_HOST env var
if Mix.env() in [:dev, :test, :small_dev, :small_test] do
defp extract_s3_url(presigned_url) do
[s3_url, _] = String.split(presigned_url, "?")
if ch_host = System.get_env("S3_CLICKHOUSE_HOST") do
URI.to_string(%URI{URI.parse(s3_url) | host: ch_host})
else
s3_url
end
end
else
defp extract_s3_url(presigned_url) do
[s3_url, _] = String.split(presigned_url, "?")
s3_url
end
end
@doc """ @doc """
Chunks and uploads Zip archive to the provided S3 destination. Chunks and uploads Zip archive to the provided S3 destination.
@ -84,25 +11,15 @@ defmodule Plausible.S3 do
In the current implementation the bucket always goes into the path component. In the current implementation the bucket always goes into the path component.
""" """
@spec export_upload_multipart(Enumerable.t(), String.t(), Path.t(), String.t(), keyword) :: @spec export_upload_multipart(Enumerable.t(), String.t(), Path.t(), keyword) ::
:uri_string.uri_string() :uri_string.uri_string()
def export_upload_multipart(stream, s3_bucket, s3_path, filename, config_overrides \\ []) do def export_upload_multipart(stream, s3_bucket, s3_path, config_overrides \\ []) do
config = ExAws.Config.new(:s3) config = ExAws.Config.new(:s3)
encoded_filename = URI.encode(filename)
disposition = ~s[attachment; filename="#{encoded_filename}"]
disposition =
if encoded_filename != filename do
disposition <> "; filename*=utf-8''#{encoded_filename}"
else
disposition
end
# 5 MiB is the smallest chunk size AWS S3 supports # 5 MiB is the smallest chunk size AWS S3 supports
chunk_into_parts(stream, 5 * 1024 * 1024) chunk_into_parts(stream, 5 * 1024 * 1024)
|> ExAws.S3.upload(s3_bucket, s3_path, |> ExAws.S3.upload(s3_bucket, s3_path,
content_disposition: disposition, content_disposition: ~s|attachment; filename="Plausible.zip"|,
content_type: "application/zip" content_type: "application/zip"
) )
|> ExAws.request!(config_overrides) |> ExAws.request!(config_overrides)
@ -142,12 +59,6 @@ defmodule Plausible.S3 do
@doc """ @doc """
Returns `access_key_id` and `secret_access_key` to be used by ClickHouse during imports from S3. Returns `access_key_id` and `secret_access_key` to be used by ClickHouse during imports from S3.
Example:
iex> import_clickhouse_credentials()
%{access_key_id: "minioadmin", secret_access_key: "minioadmin"}
""" """
@spec import_clickhouse_credentials :: @spec import_clickhouse_credentials ::
%{access_key_id: String.t(), secret_access_key: String.t()} %{access_key_id: String.t(), secret_access_key: String.t()}

@ -5,6 +5,17 @@ defmodule Plausible.Sentry.Client do
require Logger require Logger
@doc """
The Sentry.HTTPClient behaviour requires a child spec to be supplied.
In this case we don't want Sentry to manage our Finch instances, hence it's fed
with a dummy module for the sake of the contract.
XXX: Submit a Sentry PR making the child spec callback optional.
"""
def child_spec do
Task.child_spec(fn -> :noop end)
end
def post(url, headers, body) do def post(url, headers, body) do
req_opts = Application.get_env(:plausible, __MODULE__)[:finch_request_opts] || [] req_opts = Application.get_env(:plausible, __MODULE__)[:finch_request_opts] || []

@ -42,19 +42,7 @@ defmodule Plausible.Session.CacheStore do
session session
| user_id: event.user_id, | user_id: event.user_id,
timestamp: event.timestamp, timestamp: event.timestamp,
entry_page: exit_page: event.pathname,
if(session.entry_page == "" and event.name == "pageview",
do: event.pathname,
else: session.entry_page
),
hostname:
if(event.name == "pageview" and session.hostname == "",
do: event.hostname,
else: session.hostname
),
exit_page: if(event.name == "pageview", do: event.pathname, else: session.exit_page),
exit_page_hostname:
if(event.name == "pageview", do: event.hostname, else: session.exit_page_hostname),
is_bounce: false, is_bounce: false,
duration: Timex.diff(event.timestamp, session.start, :second) |> abs, duration: Timex.diff(event.timestamp, session.start, :second) |> abs,
pageviews: pageviews:
@ -67,12 +55,11 @@ defmodule Plausible.Session.CacheStore do
%Plausible.ClickhouseSessionV2{ %Plausible.ClickhouseSessionV2{
sign: 1, sign: 1,
session_id: Plausible.ClickhouseSessionV2.random_uint64(), session_id: Plausible.ClickhouseSessionV2.random_uint64(),
hostname: if(event.name == "pageview", do: event.hostname, else: ""), hostname: event.hostname,
site_id: event.site_id, site_id: event.site_id,
user_id: event.user_id, user_id: event.user_id,
entry_page: if(event.name == "pageview", do: event.pathname, else: ""), entry_page: event.pathname,
exit_page: if(event.name == "pageview", do: event.pathname, else: ""), exit_page: event.pathname,
exit_page_hostname: if(event.name == "pageview", do: event.hostname, else: ""),
is_bounce: true, is_bounce: true,
duration: 0, duration: 0,
pageviews: if(event.name == "pageview", do: 1, else: 0), pageviews: if(event.name == "pageview", do: 1, else: 0),

@ -24,7 +24,7 @@ defmodule Plausible.Shield.CountryRule do
|> cast(attrs, [:site_id, :country_code]) |> cast(attrs, [:site_id, :country_code])
|> validate_required([:site_id, :country_code]) |> validate_required([:site_id, :country_code])
|> validate_length(:country_code, is: 2) |> validate_length(:country_code, is: 2)
|> validate_change(:country_code, fn :country_code, cc -> |> Ecto.Changeset.validate_change(:country_code, fn :country_code, cc ->
if cc in Enum.map(Location.Country.all(), & &1.alpha_2) do if cc in Enum.map(Location.Country.all(), & &1.alpha_2) do
[] []
else else

@ -1,85 +0,0 @@
defmodule CompiledRegex do
@moduledoc """
Ensures that the regex is compiled on load
"""
use Ecto.Type
def type, do: :string
def cast(val) when is_binary(val), do: {:ok, val}
def cast(_), do: :error
def load(val), do: {:ok, Regex.compile!(val)}
def dump(val), do: {:ok, val}
end
defmodule Plausible.Shield.PageRule do
@moduledoc """
Schema for Pages block list
"""
use Ecto.Schema
import Ecto.Changeset
@type t() :: %__MODULE__{}
@primary_key {:id, :binary_id, autogenerate: true}
schema "shield_rules_page" do
belongs_to :site, Plausible.Site
field :page_path, :string
field :page_path_pattern, CompiledRegex
field :action, Ecto.Enum, values: [:deny, :allow], default: :deny
field :added_by, :string
# If `from_cache?` is set, the struct might be incomplete - see `Plausible.Site.Shield.Rules.IP.Cache`
field :from_cache?, :boolean, virtual: true, default: false
timestamps()
end
def changeset(rule \\ %__MODULE__{}, attrs) do
rule
|> cast(attrs, [:site_id, :page_path])
|> validate_required([:site_id, :page_path])
|> validate_length(:page_path, max: 250)
|> validate_change(:page_path, fn :page_path, p ->
if not String.starts_with?(p, "/") do
[page_path: "must start with /"]
else
[]
end
end)
|> store_regex()
|> unique_constraint(:page_path_pattern,
name: :shield_rules_page_site_id_page_path_pattern_index,
error_key: :page_path,
message: "rule already exists"
)
end
defp store_regex(changeset) do
case get_field(changeset, :page_path) do
"/" <> _ = page_path ->
regex =
page_path
|> Regex.escape()
|> String.replace("\\*\\*", ".*")
|> String.replace("\\*", ".*")
regex = "^#{regex}$"
verify_valid_regex(changeset, regex)
_ ->
changeset
end
end
defp verify_valid_regex(changeset, regex) do
case Regex.compile(regex) do
{:ok, _} ->
put_change(changeset, :page_path_pattern, regex)
{:error, _} ->
add_error(changeset, :page_path, "could not compile regular expression")
end
end
end

@ -1,65 +0,0 @@
defmodule Plausible.Shield.PageRuleCache do
@moduledoc """
Allows retrieving Page Rules by domain
"""
alias Plausible.Shield.PageRule
import Ecto.Query
use Plausible.Cache
@cache_name :page_blocklist_by_domain
@cached_schema_fields ~w(
id
page_path_pattern
action
)a
@impl true
def name(), do: @cache_name
@impl true
def child_id(), do: :cache_page_blocklist
@impl true
def count_all() do
Plausible.Repo.aggregate(PageRule, :count)
end
@impl true
def base_db_query() do
from rule in PageRule,
inner_join: s in assoc(rule, :site),
select: {
s.domain,
s.domain_changed_from,
%{struct(rule, ^@cached_schema_fields) | from_cache?: true}
}
end
@impl true
def get_from_source(domain) do
query =
base_db_query()
|> where([..., site], site.domain == ^domain)
case Plausible.Repo.one(query) do
{_, _, rule} -> %PageRule{rule | from_cache?: false}
_any -> nil
end
end
@impl true
def unwrap_cache_keys(items) do
Enum.reduce(items, [], fn
{domain, nil, object}, acc ->
[{domain, object} | acc]
{domain, domain_changed_from, object}, acc ->
[
{domain, object},
{domain_changed_from, object} | acc
]
end)
end
end

@ -13,63 +13,11 @@ defmodule Plausible.Shields do
@maximum_country_rules 30 @maximum_country_rules 30
def maximum_country_rules(), do: @maximum_country_rules def maximum_country_rules(), do: @maximum_country_rules
@maximum_page_rules 30
def maximum_page_rules(), do: @maximum_page_rules
@spec list_ip_rules(Site.t() | non_neg_integer()) :: [Shield.IPRule.t()] @spec list_ip_rules(Site.t() | non_neg_integer()) :: [Shield.IPRule.t()]
def list_ip_rules(site_or_id) do def list_ip_rules(site_or_id) do
list(Shield.IPRule, site_or_id) list(Shield.IPRule, site_or_id)
end end
@spec ip_blocked?(Site.t() | String.t(), String.t()) :: boolean()
def ip_blocked?(%Site{domain: domain}, address) do
ip_blocked?(domain, address)
end
def ip_blocked?(domain, address) when is_binary(domain) and is_binary(address) do
case Shield.IPRuleCache.get({domain, address}) do
%Shield.IPRule{action: :deny} ->
true
_ ->
false
end
end
@spec page_blocked?(Site.t() | String.t(), String.t()) :: boolean()
def page_blocked?(%Site{domain: domain}, address) do
page_blocked?(domain, address)
end
def page_blocked?(domain, pathname) when is_binary(domain) and is_binary(pathname) do
page_rules = Shield.PageRuleCache.get(domain)
if page_rules do
page_rules
|> List.wrap()
|> Enum.find_value(false, fn rule ->
rule.action == :deny and Regex.match?(rule.page_path_pattern, pathname)
end)
else
false
end
end
@spec country_blocked?(Site.t() | String.t(), String.t()) :: boolean()
def country_blocked?(%Site{domain: domain}, country_code) do
country_blocked?(domain, country_code)
end
def country_blocked?(domain, country_code) when is_binary(domain) and is_binary(country_code) do
case Shield.CountryRuleCache.get({domain, String.upcase(country_code)}) do
%Shield.CountryRule{action: :deny} ->
true
_ ->
false
end
end
@spec add_ip_rule(Site.t() | non_neg_integer(), map(), Keyword.t()) :: @spec add_ip_rule(Site.t() | non_neg_integer(), map(), Keyword.t()) ::
{:ok, Shield.IPRule.t()} | {:error, Ecto.Changeset.t()} {:ok, Shield.IPRule.t()} | {:error, Ecto.Changeset.t()}
def add_ip_rule(site_or_id, params, opts \\ []) do def add_ip_rule(site_or_id, params, opts \\ []) do
@ -111,28 +59,6 @@ defmodule Plausible.Shields do
count(Shield.CountryRule, site_or_id) count(Shield.CountryRule, site_or_id)
end end
@spec list_page_rules(Site.t() | non_neg_integer()) :: [Shield.PageRule.t()]
def list_page_rules(site_or_id) do
list(Shield.PageRule, site_or_id)
end
@spec add_page_rule(Site.t() | non_neg_integer(), map(), Keyword.t()) ::
{:ok, Shield.PageRule.t()} | {:error, Ecto.Changeset.t()}
def add_page_rule(site_or_id, params, opts \\ []) do
opts = Keyword.put(opts, :limit, {:page_path, @maximum_page_rules})
add(Shield.PageRule, site_or_id, params, opts)
end
@spec remove_page_rule(Site.t() | non_neg_integer(), String.t()) :: :ok
def remove_page_rule(site_or_id, rule_id) do
remove(Shield.PageRule, site_or_id, rule_id)
end
@spec count_page_rules(Site.t() | non_neg_integer()) :: non_neg_integer()
def count_page_rules(site_or_id) do
count(Shield.PageRule, site_or_id)
end
defp list(schema, %Site{id: id}) do defp list(schema, %Site{id: id}) do
list(schema, id) list(schema, id)
end end

@ -1,136 +0,0 @@
defmodule Plausible.Shields.CountryTest do
use Plausible.DataCase
import Plausible.Shields
setup do
site = insert(:site)
{:ok, %{site: site}}
end
describe "add_country_rule/2" do
test "no input", %{site: site} do
assert {:error, changeset} = add_country_rule(site, %{})
assert changeset.errors == [country_code: {"can't be blank", [validation: :required]}]
refute changeset.valid?
end
test "unsupported country", %{site: site} do
assert {:error, changeset} = add_country_rule(site, %{"country_code" => "0X"})
assert changeset.errors == [country_code: {"is invalid", []}]
refute changeset.valid?
end
test "incorrect country format", %{site: site} do
assert {:error, changeset} = add_country_rule(site, %{"country_code" => "Germany"})
assert changeset.errors ==
[
{:country_code, {"is invalid", []}},
{:country_code,
{"should be %{count} character(s)",
[count: 2, validation: :length, kind: :is, type: :string]}}
]
refute changeset.valid?
end
test "double insert", %{site: site} do
assert {:ok, _} = add_country_rule(site, %{"country_code" => "EE"})
assert {:error, changeset} = add_country_rule(site, %{"country_code" => "EE"})
refute changeset.valid?
assert changeset.errors == [
country_code:
{"has already been taken",
[
{:constraint, :unique},
{:constraint_name, "shield_rules_country_site_id_country_code_index"}
]}
]
end
test "over limit", %{site: site} do
country_codes =
Location.Country.all()
|> Enum.take(Plausible.Shields.maximum_country_rules())
|> Enum.map(& &1.alpha_2)
for cc <- country_codes do
assert {:ok, _} =
add_country_rule(site, %{"country_code" => cc})
end
assert count_country_rules(site) == maximum_country_rules()
assert {:error, changeset} =
add_country_rule(site, %{"country_code" => "US"})
refute changeset.valid?
assert changeset.errors == [country_code: {"maximum reached", []}]
end
test "with added_by", %{site: site} do
assert {:ok, rule} =
add_country_rule(site, %{"country_code" => "EE"},
added_by: build(:user, name: "Joe", email: "joe@example.com")
)
assert rule.added_by == "Joe <joe@example.com>"
end
end
describe "remove_country_rule/2" do
test "is idempontent", %{site: site} do
{:ok, rule} = add_country_rule(site, %{"country_code" => "EE"})
assert remove_country_rule(site, rule.id) == :ok
refute Repo.get(Plausible.Shield.CountryRule, rule.id)
assert remove_country_rule(site, rule.id) == :ok
end
end
describe "list_country_rules/1" do
test "empty", %{site: site} do
assert(list_country_rules(site) == [])
end
@tag :slow
test "many", %{site: site} do
{:ok, r1} = add_country_rule(site, %{"country_code" => "EE"})
:timer.sleep(1000)
{:ok, r2} = add_country_rule(site, %{"country_code" => "PL"})
assert [^r2, ^r1] = list_country_rules(site)
end
end
describe "count_country_rules/1" do
test "counts", %{site: site} do
assert count_country_rules(site) == 0
{:ok, _} = add_country_rule(site, %{"country_code" => "EE"})
assert count_country_rules(site) == 1
{:ok, _} = add_country_rule(site, %{"country_code" => "PL"})
assert count_country_rules(site) == 2
end
end
describe "Country Rules" do
test "end to end", %{site: site} do
site2 = insert(:site)
assert count_country_rules(site.id) == 0
assert list_country_rules(site.id) == []
assert {:ok, rule} =
add_country_rule(site.id, %{"country_code" => "EE"})
add_country_rule(site2, %{"country_code" => "PL"})
assert count_country_rules(site) == 1
assert [^rule] = list_country_rules(site)
assert rule.country_code == "EE"
assert rule.action == :deny
refute rule.from_cache?
assert country_blocked?(site, "ee")
refute country_blocked?(site, "xx")
end
end
end

@ -1,147 +0,0 @@
defmodule Plausible.Shields.IPTest do
use Plausible.DataCase
import Plausible.Shields
setup do
site = insert(:site)
{:ok, %{site: site}}
end
describe "add_ip_rule/2" do
test "no input", %{site: site} do
assert {:error, changeset} = add_ip_rule(site, %{})
assert changeset.errors == [inet: {"can't be blank", [validation: :required]}]
refute changeset.valid?
end
test "unsupported netmask", %{site: site} do
assert {:error, changeset} = add_ip_rule(site, %{"inet" => "127.0.0.0/24"})
assert changeset.errors == [inet: {"netmask unsupported", []}]
refute changeset.valid?
assert {:ok, _} = add_ip_rule(site, %{"inet" => "127.0.0.0/32"})
end
test "incorrect ip", %{site: site} do
assert {:error, changeset} = add_ip_rule(site, %{"inet" => "999.999.999.999"})
assert changeset.errors == [
inet: {"is invalid", [{:type, EctoNetwork.INET}, {:validation, :cast}]}
]
refute changeset.valid?
end
test "non-strict IPs", %{site: site} do
assert {:error, _} = add_ip_rule(site, %{"inet" => "111"})
end
test "double insert", %{site: site} do
assert {:ok, _} = add_ip_rule(site, %{"inet" => "0.0.0.111"})
assert {:error, changeset} = add_ip_rule(site, %{"inet" => "0.0.0.111"})
refute changeset.valid?
assert changeset.errors == [
inet:
{"has already been taken",
[
{:constraint, :unique},
{:constraint_name, "shield_rules_ip_site_id_inet_index"}
]}
]
end
test "ipv6", %{site: site} do
assert {:ok, rule} =
add_ip_rule(site, %{"inet" => "2001:0000:130F:0000:0000:09C0:876A:130B"})
assert ^rule = Repo.get(Plausible.Shield.IPRule, rule.id)
end
test "ipv4", %{site: site} do
assert {:ok, rule} =
add_ip_rule(site, %{"inet" => "1.1.1.1"})
assert ^rule = Repo.get(Plausible.Shield.IPRule, rule.id)
end
test "over limit", %{site: site} do
for i <- 1..maximum_ip_rules() do
assert {:ok, _} =
add_ip_rule(site, %{"inet" => "1.1.1.#{i}"})
end
assert count_ip_rules(site) == maximum_ip_rules()
assert {:error, changeset} =
add_ip_rule(site, %{"inet" => "1.1.1.31"})
refute changeset.valid?
assert changeset.errors == [inet: {"maximum reached", []}]
end
test "with added_by", %{site: site} do
assert {:ok, rule} =
add_ip_rule(site, %{"inet" => "1.1.1.1"},
added_by: build(:user, name: "Joe", email: "joe@example.com")
)
assert rule.added_by == "Joe <joe@example.com>"
end
end
describe "remove_ip_rule/2" do
test "is idempontent", %{site: site} do
{:ok, rule} = add_ip_rule(site, %{"inet" => "127.0.0.1"})
assert remove_ip_rule(site, rule.id) == :ok
refute Repo.get(Plausible.Shield.IPRule, rule.id)
assert remove_ip_rule(site, rule.id) == :ok
end
end
describe "list_ip_rules/1" do
test "empty", %{site: site} do
assert(list_ip_rules(site) == [])
end
@tag :slow
test "many", %{site: site} do
{:ok, r1} = add_ip_rule(site, %{"inet" => "127.0.0.1"})
:timer.sleep(1000)
{:ok, r2} = add_ip_rule(site, %{"inet" => "127.0.0.2"})
assert [^r2, ^r1] = list_ip_rules(site)
end
end
describe "count_ip_rules/1" do
test "counts", %{site: site} do
assert count_ip_rules(site) == 0
{:ok, _} = add_ip_rule(site, %{"inet" => "127.0.0.1"})
assert count_ip_rules(site) == 1
{:ok, _} = add_ip_rule(site, %{"inet" => "127.0.0.2"})
assert count_ip_rules(site) == 2
end
end
describe "IP Rules" do
test "end to end", %{site: site} do
site2 = insert(:site)
assert count_ip_rules(site.id) == 0
assert list_ip_rules(site.id) == []
assert {:ok, rule} =
add_ip_rule(site.id, %{"inet" => "127.0.0.1", "description" => "Localhost"})
add_ip_rule(site2, %{"inet" => "127.0.0.1", "description" => "Localhost"})
assert count_ip_rules(site) == 1
assert [^rule] = list_ip_rules(site)
assert rule.inet == %Postgrex.INET{address: {127, 0, 0, 1}, netmask: 32}
assert rule.description == "Localhost"
assert rule.action == :deny
refute rule.from_cache?
assert ip_blocked?(site, "127.0.0.1")
refute ip_blocked?(site, "127.0.0.2")
end
end
end

@ -1,174 +0,0 @@
defmodule Plausible.Shields.PageTest do
use Plausible.DataCase
import Plausible.Shields
setup do
site = insert(:site)
{:ok, %{site: site}}
end
describe "add_page_rule/2" do
test "no input", %{site: site} do
assert {:error, changeset} = add_page_rule(site, %{})
assert changeset.errors == [page_path: {"can't be blank", [validation: :required]}]
refute changeset.valid?
end
test "no slash", %{site: site} do
assert {:error, changeset} = add_page_rule(site, %{"page_path" => "test"})
assert changeset.errors == [page_path: {"must start with /", []}]
refute changeset.valid?
end
test "lengthy", %{site: site} do
long = "/" <> :binary.copy("a", 251)
assert {:error, changeset} = add_page_rule(site, %{"page_path" => long})
assert [page_path: {"should be at most %{count} character(s)", _}] = changeset.errors
refute changeset.valid?
end
test "double insert", %{site: site} do
assert {:ok, _} = add_page_rule(site, %{"page_path" => "/test"})
assert {:error, changeset} = add_page_rule(site, %{"page_path" => "/test"})
refute changeset.valid?
assert changeset.errors == [
page_path:
{"rule already exists",
[
{:constraint, :unique},
{:constraint_name, "shield_rules_page_site_id_page_path_pattern_index"}
]}
]
end
test "equivalent rules are counted as dupes", %{site: site} do
assert {:ok, _} = add_page_rule(site, %{"page_path" => "/test/*"})
assert {:error, changeset} = add_page_rule(site, %{"page_path" => "/test/**"})
assert changeset.errors == [
page_path:
{"rule already exists",
[
{:constraint, :unique},
{:constraint_name, "shield_rules_page_site_id_page_path_pattern_index"}
]}
]
end
test "regex storage: wildcard", %{site: site} do
assert {:ok, rule} = add_page_rule(site, %{"page_path" => "/test/*"})
assert rule.page_path_pattern == "^/test/.*$"
end
test "regex storage: no wildcard", %{site: site} do
assert {:ok, rule} = add_page_rule(site, %{"page_path" => "/test"})
assert rule.page_path_pattern == "^/test$"
end
test "regex storage: escaping", %{site: site} do
assert {:ok, rule} = add_page_rule(site, %{"page_path" => "/test/*/**/|+[0-9]"})
assert rule.page_path_pattern == "^/test/.*/.*/\\|\\+\\[0\\-9\\]$"
end
test "over limit", %{site: site} do
for i <- 1..maximum_page_rules() do
assert {:ok, _} =
add_page_rule(site, %{"page_path" => "/test/#{i}"})
end
assert count_page_rules(site) == maximum_page_rules()
assert {:error, changeset} =
add_page_rule(site, %{"page_path" => "/test/31"})
refute changeset.valid?
assert changeset.errors == [page_path: {"maximum reached", []}]
end
test "with added_by", %{site: site} do
assert {:ok, rule} =
add_page_rule(site, %{"page_path" => "/test"},
added_by: build(:user, name: "Joe", email: "joe@example.com")
)
assert rule.added_by == "Joe <joe@example.com>"
end
end
describe "page pattern matching" do
test "no wildcard", %{site: site} do
assert {:ok, _} = add_page_rule(site, %{"page_path" => "/test"})
assert page_blocked?(site, "/test")
refute page_blocked?(site, "/test/hello")
refute page_blocked?(site, "test")
end
test "wildcard", %{site: site} do
assert {:ok, _} = add_page_rule(site, %{"page_path" => "/test/*"})
refute page_blocked?(site, "/test")
assert page_blocked?(site, "/test/")
assert page_blocked?(site, "/test/hello")
refute page_blocked?(site, "test")
refute page_blocked?(site, "/testing")
end
end
describe "remove_page_rule/2" do
test "is idempontent", %{site: site} do
{:ok, rule} = add_page_rule(site, %{"page_path" => "/test"})
assert remove_page_rule(site, rule.id) == :ok
refute Repo.get(Plausible.Shield.PageRule, rule.id)
assert remove_page_rule(site, rule.id) == :ok
end
end
describe "list_page_rules/1" do
test "empty", %{site: site} do
assert(list_page_rules(site) == [])
end
@tag :slow
test "many", %{site: site} do
{:ok, r1} = add_page_rule(site, %{"page_path" => "/test"})
:timer.sleep(1000)
{:ok, r2} = add_page_rule(site, %{"page_path" => "/test"})
assert [^r2, ^r1] = list_page_rules(site)
end
end
describe "count_page_rules/1" do
test "counts", %{site: site} do
assert count_page_rules(site) == 0
{:ok, _} = add_page_rule(site, %{"page_path" => "/test1"})
assert count_page_rules(site) == 1
{:ok, _} = add_page_rule(site, %{"page_path" => "/test2"})
assert count_page_rules(site) == 2
end
end
describe "Page Rules" do
test "end to end", %{site: site} do
site2 = insert(:site)
assert count_page_rules(site.id) == 0
assert list_page_rules(site.id) == []
assert {:ok, rule} =
add_page_rule(site.id, %{
"page_path" => "/test"
})
add_page_rule(site2, %{"page_path" => "/test"})
assert count_page_rules(site) == 1
assert [%{id: rule_id}] = list_page_rules(site)
assert rule.id == rule_id
assert rule.page_path == "/test"
assert rule.action == :deny
refute rule.from_cache?
assert page_blocked?(site, "/test")
refute page_blocked?(site, "/testing")
end
end
end

@ -59,7 +59,7 @@ defmodule Plausible.Site do
# `site` in `assigns`. # `site` in `assigns`.
field :import_data_loaded, :boolean, default: false, virtual: true field :import_data_loaded, :boolean, default: false, virtual: true
field :earliest_import_start_date, :date, virtual: true field :earliest_import_start_date, :date, virtual: true
field :latest_import_end_date, :date, virtual: true field :earliest_import_end_date, :date, virtual: true
field :complete_import_ids, {:array, :integer}, default: [], virtual: true field :complete_import_ids, {:array, :integer}, default: [], virtual: true
timestamps() timestamps()

@ -23,14 +23,6 @@ defmodule Plausible.Sites do
Repo.get_by!(Site, domain: domain) Repo.get_by!(Site, domain: domain)
end end
def get_domain!(site_id) do
Plausible.Repo.one!(
from s in Plausible.Site,
where: [id: ^site_id],
select: s.domain
)
end
@spec toggle_pin(Auth.User.t(), Site.t()) :: @spec toggle_pin(Auth.User.t(), Site.t()) ::
{:ok, Site.UserPreference.t()} | {:error, :too_many_pins} {:ok, Site.UserPreference.t()} | {:error, :too_many_pins}
def toggle_pin(user, site) do def toggle_pin(user, site) do

@ -5,6 +5,17 @@ defmodule Plausible.Stats.Aggregate do
import Ecto.Query import Ecto.Query
alias Plausible.Stats.{Query, Util} alias Plausible.Stats.{Query, Util}
@revenue_metrics on_full_build(do: Plausible.Stats.Goal.Revenue.revenue_metrics(), else: [])
@event_metrics [
:visitors,
:pageviews,
:events,
:sample_percent
] ++ @revenue_metrics
@session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit, :sample_percent]
def aggregate(site, query, metrics) do def aggregate(site, query, metrics) do
{currency, metrics} = {currency, metrics} =
on_full_build do on_full_build do
@ -15,17 +26,18 @@ defmodule Plausible.Stats.Aggregate do
Query.trace(query, metrics) Query.trace(query, metrics)
{event_metrics, session_metrics, other_metrics} = event_metrics =
metrics metrics
|> Util.maybe_add_visitors_metric() |> Util.maybe_add_visitors_metric()
|> Plausible.Stats.TableDecider.partition_metrics(query) |> Enum.filter(&(&1 in @event_metrics))
event_task = fn -> aggregate_events(site, query, event_metrics) end event_task = fn -> aggregate_events(site, query, event_metrics) end
session_metrics = Enum.filter(metrics, &(&1 in @session_metrics))
session_task = fn -> aggregate_sessions(site, query, session_metrics) end session_task = fn -> aggregate_sessions(site, query, session_metrics) end
time_on_page_task = time_on_page_task =
if :time_on_page in other_metrics do if :time_on_page in metrics do
fn -> aggregate_time_on_page(site, query) end fn -> aggregate_time_on_page(site, query) end
else else
fn -> %{} end fn -> %{} end
@ -33,6 +45,7 @@ defmodule Plausible.Stats.Aggregate do
Plausible.ClickhouseRepo.parallel_tasks([session_task, event_task, time_on_page_task]) Plausible.ClickhouseRepo.parallel_tasks([session_task, event_task, time_on_page_task])
|> Enum.reduce(%{}, fn aggregate, task_result -> Map.merge(aggregate, task_result) end) |> Enum.reduce(%{}, fn aggregate, task_result -> Map.merge(aggregate, task_result) end)
|> maybe_put_cr(site, query, metrics)
|> Util.keep_requested_metrics(metrics) |> Util.keep_requested_metrics(metrics)
|> cast_revenue_metrics_to_money(currency) |> cast_revenue_metrics_to_money(currency)
|> Enum.map(&maybe_round_value/1) |> Enum.map(&maybe_round_value/1)
@ -40,20 +53,45 @@ defmodule Plausible.Stats.Aggregate do
|> Enum.into(%{}) |> Enum.into(%{})
end end
defp maybe_put_cr(aggregate_result, site, query, metrics) do
if :conversion_rate in metrics do
all =
query
|> Query.remove_event_filters([:goal, :props])
|> then(fn query -> aggregate_events(site, query, [:visitors]) end)
|> Map.fetch!(:visitors)
converted = aggregate_result.visitors
cr = Util.calculate_cr(all, converted)
aggregate_result = Map.put(aggregate_result, :conversion_rate, cr)
if :total_visitors in metrics do
Map.put(aggregate_result, :total_visitors, all)
else
aggregate_result
end
else
aggregate_result
end
end
defp aggregate_events(_, _, []), do: %{} defp aggregate_events(_, _, []), do: %{}
defp aggregate_events(site, query, metrics) do defp aggregate_events(site, query, metrics) do
from(e in base_event_query(site, query), select: ^select_event_metrics(metrics)) from(e in base_event_query(site, query), select: %{})
|> select_event_metrics(metrics)
|> merge_imported(site, query, :aggregate, metrics) |> merge_imported(site, query, :aggregate, metrics)
|> maybe_add_conversion_rate(site, query, metrics, include_imported: query.include_imported)
|> ClickhouseRepo.one() |> ClickhouseRepo.one()
end end
defp aggregate_sessions(_, _, []), do: %{} defp aggregate_sessions(_, _, []), do: %{}
defp aggregate_sessions(site, query, metrics) do defp aggregate_sessions(site, query, metrics) do
from(e in query_sessions(site, query), select: ^select_session_metrics(metrics, query)) from(e in query_sessions(site, query), select: %{})
|> filter_converted_sessions(site, query) |> filter_converted_sessions(site, query)
|> select_session_metrics(metrics, query)
|> merge_imported(site, query, :aggregate, metrics) |> merge_imported(site, query, :aggregate, metrics)
|> ClickhouseRepo.one() |> ClickhouseRepo.one()
|> Util.keep_requested_metrics(metrics) |> Util.keep_requested_metrics(metrics)

@ -3,7 +3,7 @@ defmodule Plausible.Stats.Base do
use Plausible use Plausible
use Plausible.Stats.Fragments use Plausible.Stats.Fragments
alias Plausible.Stats.{Query, Filters, TableDecider} alias Plausible.Stats.{Query, Filters}
alias Plausible.Timezones alias Plausible.Timezones
import Ecto.Query import Ecto.Query
@ -15,7 +15,7 @@ defmodule Plausible.Stats.Base do
def base_event_query(site, query) do def base_event_query(site, query) do
events_q = query_events(site, query) events_q = query_events(site, query)
if TableDecider.events_join_sessions?(query) do if Enum.any?(Filters.visit_props(), &query.filters["visit:" <> &1]) do
sessions_q = sessions_q =
from( from(
s in query_sessions(site, query), s in query_sessions(site, query),
@ -30,15 +30,11 @@ defmodule Plausible.Stats.Base do
on: e.session_id == sq.session_id on: e.session_id == sq.session_id
) )
else else
if query.experimental_reduced_joins? do events_q
events_q |> filter_by_visit_props(Filters.event_table_visit_props(), query)
else
events_q
end
end end
end end
defp query_events(site, query) do def query_events(site, query) do
{first_datetime, last_datetime} = utc_boundaries(query, site) {first_datetime, last_datetime} = utc_boundaries(query, site)
q = q =
@ -52,10 +48,7 @@ defmodule Plausible.Stats.Base do
q = Plausible.Stats.Sampling.add_query_hint(q, query) q = Plausible.Stats.Sampling.add_query_hint(q, query)
end end
q = q = from(e in q, where: ^dynamic_filter_condition(query, "event:page", :pathname))
q
|> where([e], ^dynamic_filter_condition(query, "event:page", :pathname))
|> where([e], ^dynamic_filter_condition(query, "event:hostname", :hostname))
q = q =
case query.filters["event:name"] do case query.filters["event:name"] do
@ -129,6 +122,17 @@ defmodule Plausible.Stats.Base do
q q
end end
@api_prop_name_to_db %{
"source" => "referrer_source",
"device" => "screen_size",
"screen" => "screen_size",
"os" => "operating_system",
"os_version" => "operating_system_version",
"country" => "country_code",
"region" => "subdivision1_code",
"city" => "city_geoname_id"
}
def query_sessions(site, query) do def query_sessions(site, query) do
{first_datetime, last_datetime} = {first_datetime, last_datetime} =
utc_boundaries(query, site) utc_boundaries(query, site)
@ -136,7 +140,8 @@ defmodule Plausible.Stats.Base do
q = from(s in "sessions_v2", where: s.site_id == ^site.id) q = from(s in "sessions_v2", where: s.site_id == ^site.id)
sessions_q = sessions_q =
if query.experimental_session_count? do if FunWithFlags.enabled?(:experimental_session_count, for: site) or
query.experimental_session_count? do
from s in q, where: s.timestamp >= ^first_datetime and s.start < ^last_datetime from s in q, where: s.timestamp >= ^first_datetime and s.start < ^last_datetime
else else
from s in q, where: s.start >= ^first_datetime and s.start < ^last_datetime from s in q, where: s.start >= ^first_datetime and s.start < ^last_datetime
@ -146,24 +151,9 @@ defmodule Plausible.Stats.Base do
sessions_q = Plausible.Stats.Sampling.add_query_hint(sessions_q, query) sessions_q = Plausible.Stats.Sampling.add_query_hint(sessions_q, query)
end end
filter_by_entry_props(sessions_q, query) sessions_q = filter_by_entry_props(sessions_q, query)
|> filter_by_visit_props(Filters.visit_props(), query)
end
@api_prop_name_to_db %{ Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q ->
"source" => "referrer_source",
"device" => "screen_size",
"screen" => "screen_size",
"os" => "operating_system",
"os_version" => "operating_system_version",
"country" => "country_code",
"region" => "subdivision1_code",
"city" => "city_geoname_id",
"entry_page_hostname" => "hostname"
}
defp filter_by_visit_props(q, visit_props, query) do
Enum.reduce(visit_props, q, fn prop_name, sessions_q ->
filter_key = "visit:" <> prop_name filter_key = "visit:" <> prop_name
db_field = db_field =
@ -219,159 +209,163 @@ defmodule Plausible.Stats.Base do
def apply_entry_prop_filter(sessions_q, _, _), do: sessions_q def apply_entry_prop_filter(sessions_q, _, _), do: sessions_q
def select_event_metrics(metrics) do def select_event_metrics(q, []), do: q
metrics
|> Enum.map(&select_event_metric/1)
|> Enum.reduce(%{}, &Map.merge/2)
end
defp select_event_metric(:pageviews) do def select_event_metrics(q, [:pageviews | rest]) do
%{ from(e in q,
pageviews: select_merge: %{
dynamic( pageviews:
[e],
fragment("toUInt64(round(countIf(? = 'pageview') * any(_sample_factor)))", e.name) fragment("toUInt64(round(countIf(? = 'pageview') * any(_sample_factor)))", e.name)
) }
} )
end |> select_event_metrics(rest)
defp select_event_metric(:events) do
%{
events: dynamic([], fragment("toUInt64(round(count(*) * any(_sample_factor)))"))
}
end end
defp select_event_metric(:visitors) do def select_event_metrics(q, [:events | rest]) do
%{ from(e in q,
visitors: dynamic([e], selected_as(fragment(@uniq_users_expression, e.user_id), :visitors)) select_merge: %{events: fragment("toUInt64(round(count(*) * any(_sample_factor)))")}
} )
|> select_event_metrics(rest)
end end
defp select_event_metric(:visits) do def select_event_metrics(q, [:visitors | rest]) do
%{ from(e in q,
visits: select_merge: %{
dynamic([e], fragment("toUInt64(round(uniq(?) * any(_sample_factor)))", e.session_id)) visitors: selected_as(fragment(@uniq_users_expression, e.user_id), :visitors)
} }
)
|> select_event_metrics(rest)
end end
on_full_build do on_full_build do
defp select_event_metric(:total_revenue) do def select_event_metrics(q, [:total_revenue | rest]) do
%{total_revenue: Plausible.Stats.Goal.Revenue.total_revenue_query()} q
|> Plausible.Stats.Goal.Revenue.total_revenue_query()
|> select_event_metrics(rest)
end end
defp select_event_metric(:average_revenue) do def select_event_metrics(q, [:average_revenue | rest]) do
%{average_revenue: Plausible.Stats.Goal.Revenue.average_revenue_query()} q
|> Plausible.Stats.Goal.Revenue.average_revenue_query()
|> select_event_metrics(rest)
end end
end end
defp select_event_metric(:sample_percent) do def select_event_metrics(q, [:sample_percent | rest]) do
%{ from(e in q,
sample_percent: select_merge: %{
dynamic( sample_percent:
[],
fragment("if(any(_sample_factor) > 1, round(100 / any(_sample_factor)), 100)") fragment("if(any(_sample_factor) > 1, round(100 / any(_sample_factor)), 100)")
) }
} )
|> select_event_metrics(rest)
end end
defp select_event_metric(:percentage), do: %{} def select_event_metrics(q, [:percentage | rest]) do
defp select_event_metric(:conversion_rate), do: %{} q |> select_event_metrics(rest)
defp select_event_metric(:total_visitors), do: %{} end
defp select_event_metric(unknown), do: raise("Unknown metric: #{unknown}") def select_event_metrics(_, [unknown | _]), do: raise("Unknown metric: #{unknown}")
def select_session_metrics(metrics, query) do def select_session_metrics(q, [], _query), do: q
metrics
|> Enum.map(&select_session_metric(&1, query))
|> Enum.reduce(%{}, &Map.merge/2)
end
defp select_session_metric(:bounce_rate, query) do def select_session_metrics(q, [:bounce_rate | rest], query) do
condition = dynamic_filter_condition(query, "event:page", :entry_page) condition = dynamic_filter_condition(query, "event:page", :entry_page)
%{ from(s in q,
bounce_rate: select_merge:
dynamic( ^%{
[], bounce_rate:
fragment( dynamic(
"toUInt32(ifNotFinite(round(sumIf(is_bounce * sign, ?) / sumIf(sign, ?) * 100), 0))", [],
^condition, fragment(
^condition "toUInt32(ifNotFinite(round(sumIf(is_bounce * sign, ?) / sumIf(sign, ?) * 100), 0))",
) ^condition,
), ^condition
__internal_visits: dynamic([], fragment("toUInt32(sum(sign))")) )
} ),
__internal_visits: dynamic([], fragment("toUInt32(sum(sign))"))
}
)
|> select_session_metrics(rest, query)
end end
defp select_session_metric(:visits, _query) do def select_session_metrics(q, [:visits | rest], query) do
%{ from(s in q,
visits: dynamic([s], fragment("toUInt64(round(sum(?) * any(_sample_factor)))", s.sign)) select_merge: %{
} visits: fragment("toUInt64(round(sum(?) * any(_sample_factor)))", s.sign)
}
)
|> select_session_metrics(rest, query)
end end
defp select_session_metric(:pageviews, _query) do def select_session_metrics(q, [:pageviews | rest], query) do
%{ from(s in q,
pageviews: select_merge: %{
dynamic( pageviews:
[s],
fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.pageviews) fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.pageviews)
) }
} )
|> select_session_metrics(rest, query)
end end
defp select_session_metric(:events, _query) do def select_session_metrics(q, [:events | rest], query) do
%{ from(s in q,
events: select_merge: %{
dynamic( events: fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.events)
[s], }
fragment("toUInt64(round(sum(? * ?) * any(_sample_factor)))", s.sign, s.events) )
) |> select_session_metrics(rest, query)
}
end end
defp select_session_metric(:visitors, _query) do def select_session_metrics(q, [:visitors | rest], query) do
%{ from(s in q,
visitors: select_merge: %{
dynamic( visitors:
[s],
selected_as( selected_as(
fragment("toUInt64(round(uniq(?) * any(_sample_factor)))", s.user_id), fragment("toUInt64(round(uniq(?) * any(_sample_factor)))", s.user_id),
:visitors :visitors
) )
) }
} )
|> select_session_metrics(rest, query)
end end
defp select_session_metric(:visit_duration, _query) do def select_session_metrics(q, [:visit_duration | rest], query) do
%{ from(s in q,
visit_duration: select_merge: %{
dynamic([], fragment("toUInt32(ifNotFinite(round(sum(duration * sign) / sum(sign)), 0))")), :visit_duration =>
__internal_visits: dynamic([], fragment("toUInt32(sum(sign))")) fragment("toUInt32(ifNotFinite(round(sum(duration * sign) / sum(sign)), 0))"),
} __internal_visits: fragment("toUInt32(sum(sign))")
}
)
|> select_session_metrics(rest, query)
end end
defp select_session_metric(:views_per_visit, _query) do def select_session_metrics(q, [:views_per_visit | rest], query) do
%{ from(s in q,
views_per_visit: select_merge: %{
dynamic( views_per_visit:
[s], fragment("ifNotFinite(round(sum(? * ?) / sum(?), 2), 0)", s.sign, s.pageviews, s.sign),
fragment("ifNotFinite(round(sum(? * ?) / sum(?), 2), 0)", s.sign, s.pageviews, s.sign) __internal_visits: fragment("toUInt32(sum(sign))")
), }
__internal_visits: dynamic([], fragment("toUInt32(sum(sign))")) )
} |> select_session_metrics(rest, query)
end end
defp select_session_metric(:sample_percent, _query) do def select_session_metrics(q, [:sample_percent | rest], query) do
%{ from(e in q,
sample_percent: select_merge: %{
dynamic( sample_percent:
[],
fragment("if(any(_sample_factor) > 1, round(100 / any(_sample_factor)), 100)") fragment("if(any(_sample_factor) > 1, round(100 / any(_sample_factor)), 100)")
) }
} )
|> select_session_metrics(rest, query)
end end
defp select_session_metric(:percentage, _query), do: %{} def select_session_metrics(q, [:percentage | rest], query) do
q |> select_session_metrics(rest, query)
end
def dynamic_filter_condition(query, filter_key, db_field) do def dynamic_filter_condition(query, filter_key, db_field) do
case query && query.filters && query.filters[filter_key] do case query && query.filters && query.filters[filter_key] do
@ -592,7 +586,7 @@ defmodule Plausible.Stats.Base do
|> select([e], total_visitors: fragment(@uniq_users_expression, e.user_id)) |> select([e], total_visitors: fragment(@uniq_users_expression, e.user_id))
end end
defp total_visitors_subquery(site, query, true) do defp total_visitors_subquery(site, %Query{include_imported: true} = query) do
dynamic( dynamic(
[e], [e],
selected_as( selected_as(
@ -603,16 +597,14 @@ defmodule Plausible.Stats.Base do
) )
end end
defp total_visitors_subquery(site, query, false) do defp total_visitors_subquery(site, query) do
dynamic([e], selected_as(subquery(total_visitors(site, query)), :__total_visitors)) dynamic([e], selected_as(subquery(total_visitors(site, query)), :__total_visitors))
end end
def add_percentage_metric(q, site, query, metrics) do def add_percentage_metric(q, site, query, metrics) do
if :percentage in metrics do if :percentage in metrics do
q q
|> select_merge( |> select_merge(^%{__total_visitors: total_visitors_subquery(site, query)})
^%{__total_visitors: total_visitors_subquery(site, query, query.include_imported)}
)
|> select_merge(%{ |> select_merge(%{
percentage: percentage:
fragment( fragment(
@ -626,32 +618,4 @@ defmodule Plausible.Stats.Base do
q q
end end
end end
# Adds conversion_rate metric to query, calculated as
# X / Y where Y is the same breakdown value without goal or props
# filters.
def maybe_add_conversion_rate(q, site, query, metrics, opts) do
if :conversion_rate in metrics do
include_imported = Keyword.fetch!(opts, :include_imported)
total_query = query |> Query.remove_event_filters([:goal, :props])
# :TRICKY: Subquery is used due to event:goal breakdown above doing an UNION ALL
subquery(q)
|> select_merge(
^%{total_visitors: total_visitors_subquery(site, total_query, include_imported)}
)
|> select_merge([e], %{
conversion_rate:
fragment(
"if(? > 0, round(? / ? * 100, 1), 0)",
selected_as(:__total_visitors),
e.visitors,
selected_as(:__total_visitors)
)
})
else
q
end
end
end end

@ -4,9 +4,8 @@ defmodule Plausible.Stats.Breakdown do
use Plausible.Stats.Fragments use Plausible.Stats.Fragments
import Plausible.Stats.{Base, Imported} import Plausible.Stats.{Base, Imported}
import Ecto.Query
require OpenTelemetry.Tracer, as: Tracer require OpenTelemetry.Tracer, as: Tracer
alias Plausible.Stats.{Query, Util, TableDecider} alias Plausible.Stats.{Query, Util}
@no_ref "Direct / None" @no_ref "Direct / None"
@not_set "(not set)" @not_set "(not set)"
@ -53,71 +52,50 @@ defmodule Plausible.Stats.Breakdown do
metrics_to_select = Util.maybe_add_visitors_metric(metrics) -- @computed_metrics metrics_to_select = Util.maybe_add_visitors_metric(metrics) -- @computed_metrics
event_q = event_results =
if Enum.any?(event_goals) do if Enum.any?(event_goals) do
site site
|> breakdown_events(event_query, "event:name", metrics_to_select) |> breakdown(event_query, "event:name", metrics_to_select, pagination, skip_tracing: true)
|> apply_pagination(pagination) |> transform_keys(%{name: :goal})
|> cast_revenue_metrics_to_money(revenue_goals)
else else
nil []
end end
page_q = {limit, page} = pagination
offset = (page - 1) * limit
page_results =
if Enum.any?(pageview_goals) do if Enum.any?(pageview_goals) do
page_exprs = Enum.map(pageview_goals, & &1.page_path) page_exprs = Enum.map(pageview_goals, & &1.page_path)
page_regexes = Enum.map(page_exprs, &page_regex/1) page_regexes = Enum.map(page_exprs, &page_regex/1)
select_columns = metrics_to_select |> select_event_metrics |> mark_revenue_as_nil
from(e in base_event_query(site, query), from(e in base_event_query(site, query),
order_by: [desc: fragment("uniq(?)", e.user_id)], order_by: [desc: fragment("uniq(?)", e.user_id)],
limit: ^limit,
offset: ^offset,
where: where:
fragment( fragment(
"notEmpty(multiMatchAllIndices(?, ?) as indices)", "notEmpty(multiMatchAllIndices(?, ?) as indices)",
e.pathname, e.pathname,
^page_regexes ^page_regexes
) and e.name == "pageview", ) and e.name == "pageview",
array_join: index in fragment("indices"), group_by: fragment("index"),
group_by: index,
select: %{ select: %{
name: fragment("concat('Visit ', ?[?])", ^page_exprs, index) index: fragment("arrayJoin(indices) as index"),
goal: fragment("concat('Visit ', ?[index])", ^page_exprs)
} }
) )
|> select_merge(^select_columns) |> select_event_metrics(metrics_to_select -- @revenue_metrics)
|> apply_pagination(pagination) |> ClickhouseRepo.all()
|> Enum.map(fn row -> Map.delete(row, :index) end)
else else
nil []
end
full_q =
case {event_q, page_q} do
{nil, nil} ->
nil
{event_q, nil} ->
event_q
{nil, page_q} ->
page_q
{event_q, page_q} ->
from(
e in subquery(union_all(event_q, ^page_q)),
order_by: [desc: e.visitors]
)
|> apply_pagination(pagination)
end end
if full_q do zip_results(event_results, page_results, :goal, metrics_to_select)
full_q |> maybe_add_cr(site, query, nil, metrics)
|> maybe_add_conversion_rate(site, query, metrics, include_imported: false) |> Util.keep_requested_metrics(metrics)
|> ClickhouseRepo.all()
|> transform_keys(%{name: :goal})
|> cast_revenue_metrics_to_money(revenue_goals)
|> Util.keep_requested_metrics(metrics)
else
[]
end
end end
def breakdown(site, query, "event:props:" <> custom_prop = property, metrics, pagination, opts) do def breakdown(site, query, "event:props:" <> custom_prop = property, metrics, pagination, opts) do
@ -132,11 +110,11 @@ defmodule Plausible.Stats.Breakdown do
if !Keyword.get(opts, :skip_tracing), do: trace(query, property, metrics) if !Keyword.get(opts, :skip_tracing), do: trace(query, property, metrics)
breakdown_events(site, query, "event:props:" <> custom_prop, metrics_to_select) breakdown_events(site, query, "event:props:" <> custom_prop, metrics_to_select, pagination)
|> maybe_add_conversion_rate(site, query, metrics, include_imported: false)
|> paginate_and_execute(metrics, pagination)
|> transform_keys(%{breakdown_prop_value: custom_prop})
|> Enum.map(&cast_revenue_metrics_to_money(&1, currency)) |> Enum.map(&cast_revenue_metrics_to_money(&1, currency))
|> sort_results(metrics_to_select)
|> maybe_add_cr(site, query, nil, metrics)
|> Util.keep_requested_metrics(metrics)
end end
def breakdown(site, query, "event:page" = property, metrics, pagination, opts) do def breakdown(site, query, "event:page" = property, metrics, pagination, opts) do
@ -147,10 +125,10 @@ defmodule Plausible.Stats.Breakdown do
event_result = event_result =
site site
|> breakdown_events(query, property, event_metrics) |> breakdown_events(query, "event:page", event_metrics, pagination)
|> maybe_add_group_conversion_rate(&breakdown_events/4, site, query, property, metrics)
|> paginate_and_execute(metrics, pagination)
|> maybe_add_time_on_page(site, query, metrics) |> maybe_add_time_on_page(site, query, metrics)
|> maybe_add_cr(site, query, property, metrics, pagination)
|> Util.keep_requested_metrics(metrics)
session_metrics = Enum.filter(metrics, &(&1 in @session_metrics)) session_metrics = Enum.filter(metrics, &(&1 in @session_metrics))
@ -171,8 +149,7 @@ defmodule Plausible.Stats.Breakdown do
{limit, _page} = pagination {limit, _page} = pagination
session_result = session_result =
breakdown_sessions(site, new_query, "visit:entry_page", session_metrics) breakdown_sessions(site, new_query, "visit:entry_page", session_metrics, {limit, 1})
|> paginate_and_execute(session_metrics, {limit, 1})
|> transform_keys(%{entry_page: :page}) |> transform_keys(%{entry_page: :page})
metrics = metrics ++ [:page] metrics = metrics ++ [:page]
@ -189,9 +166,7 @@ defmodule Plausible.Stats.Breakdown do
def breakdown(site, query, "event:name" = property, metrics, pagination, opts) do def breakdown(site, query, "event:name" = property, metrics, pagination, opts) do
if !Keyword.get(opts, :skip_tracing), do: trace(query, property, metrics) if !Keyword.get(opts, :skip_tracing), do: trace(query, property, metrics)
breakdown_events(site, query, property, metrics, pagination)
breakdown_events(site, query, property, metrics)
|> paginate_and_execute(metrics, pagination)
end end
def breakdown(site, query, property, metrics, pagination, opts) do def breakdown(site, query, property, metrics, pagination, opts) do
@ -199,35 +174,9 @@ defmodule Plausible.Stats.Breakdown do
metrics_to_select = Util.maybe_add_visitors_metric(metrics) -- @computed_metrics metrics_to_select = Util.maybe_add_visitors_metric(metrics) -- @computed_metrics
case breakdown_table(query, metrics, property) do breakdown_sessions(site, query, property, metrics_to_select, pagination)
:session -> |> maybe_add_cr(site, query, property, metrics, pagination)
breakdown_sessions(site, query, property, metrics_to_select) |> Util.keep_requested_metrics(metrics)
|> maybe_add_group_conversion_rate(&breakdown_sessions/4, site, query, property, metrics)
|> paginate_and_execute(metrics, pagination)
:event ->
breakdown_events(site, query, property, metrics_to_select)
|> maybe_add_group_conversion_rate(&breakdown_events/4, site, query, property, metrics)
|> paginate_and_execute(metrics, pagination)
end
end
# Backwards compatibility
# defp breakdown_table(%Query{experimental_reduced_joins?: false}, _, _), do: :session
defp breakdown_table(_query, _metrics, "visit:entry_page"), do: :session
defp breakdown_table(_query, _metrics, "visit:entry_page_hostname"), do: :session
defp breakdown_table(_query, _metrics, "visit:exit_page"), do: :session
defp breakdown_table(_query, _metrics, "visit:exit_page_hostname"), do: :session
defp breakdown_table(query, metrics, property) do
{_, session_metrics, _} = TableDecider.partition_metrics(metrics, query, property)
if not Enum.empty?(session_metrics) do
:session
else
:event
end
end end
defp zip_results(event_result, session_result, property, metrics) do defp zip_results(event_result, session_result, property, metrics) do
@ -248,32 +197,35 @@ defmodule Plausible.Stats.Breakdown do
|> sort_results(metrics) |> sort_results(metrics)
end end
defp breakdown_sessions(site, query, property, metrics) do defp breakdown_sessions(_, _, _, [], _), do: []
defp breakdown_sessions(site, query, property, metrics, pagination) do
from(s in query_sessions(site, query), from(s in query_sessions(site, query),
order_by: [desc: fragment("uniq(?)", s.user_id)], order_by: [desc: fragment("uniq(?)", s.user_id)],
select: ^select_session_metrics(metrics, query) select: %{}
) )
|> filter_converted_sessions(site, query) |> filter_converted_sessions(site, query)
|> do_group_by(property) |> do_group_by(property)
|> select_session_metrics(metrics, query)
|> merge_imported(site, query, property, metrics) |> merge_imported(site, query, property, metrics)
|> add_percentage_metric(site, query, metrics) |> add_percentage_metric(site, query, metrics)
|> apply_pagination(pagination)
|> ClickhouseRepo.all()
|> transform_keys(%{operating_system: :os})
|> Util.keep_requested_metrics(metrics)
end end
defp breakdown_events(site, query, property, metrics) do defp breakdown_events(_, _, _, [], _), do: []
defp breakdown_events(site, query, property, metrics, pagination) do
from(e in base_event_query(site, query), from(e in base_event_query(site, query),
order_by: [desc: fragment("uniq(?)", e.user_id)], order_by: [desc: fragment("uniq(?)", e.user_id)],
select: %{} select: %{}
) )
|> do_group_by(property) |> do_group_by(property)
|> select_merge(^select_event_metrics(metrics)) |> select_event_metrics(metrics)
|> merge_imported(site, query, property, metrics) |> merge_imported(site, query, property, metrics)
|> add_percentage_metric(site, query, metrics) |> add_percentage_metric(site, query, metrics)
end
defp paginate_and_execute(_, [], _), do: []
defp paginate_and_execute(q, metrics, pagination) do
q
|> apply_pagination(pagination) |> apply_pagination(pagination)
|> ClickhouseRepo.all() |> ClickhouseRepo.all()
|> transform_keys(%{operating_system: :os}) |> transform_keys(%{operating_system: :os})
@ -298,6 +250,94 @@ defmodule Plausible.Stats.Breakdown do
end end
defp breakdown_time_on_page(site, query, pages) do defp breakdown_time_on_page(site, query, pages) do
if FunWithFlags.enabled?(:window_time_on_page) do
window_breakdown_time_on_page(site, query, pages)
else
neighbor_breakdown_time_on_page(site, query, pages)
end
end
defp neighbor_breakdown_time_on_page(site, query, pages) do
q =
from(
e in base_event_query(site, Query.remove_event_filters(query, [:page, :props])),
select: {
fragment("? as p", e.pathname),
fragment("? as t", e.timestamp),
fragment("? as s", e.session_id)
},
order_by: [e.session_id, e.timestamp]
)
{base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)
select =
if query.include_imported do
"sum(td), count(case when p2 != p then 1 end)"
else
"round(sum(td)/count(case when p2 != p then 1 end))"
end
pages_idx = length(base_query_raw_params)
params = base_query_raw_params ++ [pages]
time_query = "
SELECT
p,
#{select}
FROM
(SELECT
p,
p2,
sum(t2-t) as td
FROM
(SELECT
*,
neighbor(t, 1) as t2,
neighbor(p, 1) as p2,
neighbor(s, 1) as s2
FROM (#{base_query_raw}))
WHERE s=s2 AND p IN {$#{pages_idx}:Array(String)}
GROUP BY p,p2,s)
GROUP BY p"
{:ok, res} = ClickhouseRepo.query(time_query, params)
if query.include_imported do
# Imported page views have pre-calculated values
res =
res.rows
|> Enum.map(fn [page, time, visits] -> {page, {time, visits}} end)
|> Enum.into(%{})
from(
i in "imported_pages",
group_by: i.page,
where: i.site_id == ^site.id,
where: i.date >= ^query.date_range.first and i.date <= ^query.date_range.last,
where: i.page in ^pages,
select: %{
page: i.page,
pageviews: fragment("sum(?) - sum(?)", i.pageviews, i.exits),
time_on_page: sum(i.time_on_page)
}
)
|> ClickhouseRepo.all()
|> Enum.reduce(res, fn %{page: page, pageviews: pageviews, time_on_page: time}, res ->
{restime, resviews} = Map.get(res, page, {0, 0})
Map.put(res, page, {restime + time, resviews + pageviews})
end)
|> Enum.map(fn
{page, {_, 0}} -> {page, nil}
{page, {time, pageviews}} -> {page, time / pageviews}
end)
|> Enum.into(%{})
else
res.rows |> Enum.map(fn [page, time] -> {page, time} end) |> Enum.into(%{})
end
end
defp window_breakdown_time_on_page(site, query, pages) do
import Ecto.Query import Ecto.Query
windowed_pages_q = windowed_pages_q =
@ -383,7 +423,7 @@ defmodule Plausible.Stats.Breakdown do
from( from(
e in q, e in q,
select_merge: %{ select_merge: %{
breakdown_prop_value: ^prop =>
selected_as( selected_as(
fragment( fragment(
"if(not empty(?), ?, '(none)')", "if(not empty(?), ?, '(none)')",
@ -466,8 +506,6 @@ defmodule Plausible.Stats.Breakdown do
defp do_group_by(q, "visit:entry_page") do defp do_group_by(q, "visit:entry_page") do
from( from(
s in q, s in q,
# Sessions without pageviews don't get entry_page assigned, hence they should get ignored
where: s.entry_page != "",
group_by: s.entry_page, group_by: s.entry_page,
select_merge: %{entry_page: s.entry_page}, select_merge: %{entry_page: s.entry_page},
order_by: {:asc, s.entry_page} order_by: {:asc, s.entry_page}
@ -477,8 +515,6 @@ defmodule Plausible.Stats.Breakdown do
defp do_group_by(q, "visit:exit_page") do defp do_group_by(q, "visit:exit_page") do
from( from(
s in q, s in q,
# Sessions without pageviews don't get entry_page assigned, hence they should get ignored
where: s.entry_page != "",
group_by: s.exit_page, group_by: s.exit_page,
select_merge: %{exit_page: s.exit_page}, select_merge: %{exit_page: s.exit_page},
order_by: {:asc, s.exit_page} order_by: {:asc, s.exit_page}
@ -616,26 +652,130 @@ defmodule Plausible.Stats.Breakdown do
) )
end end
defp group_by_field_names("event:props:" <> _prop), do: [:name] defp maybe_add_cr(breakdown_results, site, query, property, metrics, pagination \\ nil) do
defp group_by_field_names("visit:os"), do: [:operating_system] cond do
defp group_by_field_names("visit:os_version"), do: [:os, :os_version] :conversion_rate not in metrics -> breakdown_results
defp group_by_field_names("visit:browser_version"), do: [:browser, :browser_version] Enum.empty?(breakdown_results) -> breakdown_results
is_nil(property) -> add_absolute_cr(breakdown_results, site, query)
true -> add_cr(breakdown_results, site, query, property, metrics, pagination)
end
end
defp group_by_field_names(property), do: [Plausible.Stats.Filters.without_prefix(property)] # This function injects a conversion_rate metric into every
# breakdown result map. It is calculated as X / Y, where:
#
# * X is the number of conversions for a breakdown
# result (conversion = number of visitors who
# completed the filtered goal with the filtered
# custom properties).
#
# * Y is the number of all visitors for this breakdown
# result without the `event:goal` and `event:props:*`
# filters.
defp add_cr(breakdown_results, site, query, property, metrics, pagination) do
property_atom = Plausible.Stats.Filters.without_prefix(property)
items =
Enum.map(breakdown_results, fn item -> Map.fetch!(item, property_atom) end)
query_without_goal =
query
|> Query.put_filter(property, {:member, items})
|> Query.remove_event_filters([:goal, :props])
# Here, we're always only interested in the first page of results
# - the :member filter makes sure that the results always match with
# the items in the given breakdown_results list
page = 1
# For browser/os versions we need to fetch a lot more entries than the
# pagination limit. This is because many entries can correspond to a
# single version number and we need to make sure that the results
# without goal filter will include all those combinations of browsers/os-s
# and their versions that were present in the `breakdown_results` array.
{pagination_limit, find_match_fn} =
case property_atom do
:browser_version ->
pagination_limit = min(elem(pagination, 0) * 10, 3_000)
find_match_fn = fn total, conversion ->
total[:browser_version] == conversion[:browser_version] &&
total[:browser] == conversion[:browser]
end
{pagination_limit, find_match_fn}
:os_version ->
pagination_limit = min(elem(pagination, 0) * 5, 3_000)
find_match_fn = fn total, conversion ->
total[:os_version] == conversion[:os_version] &&
total[:os] == conversion[:os]
end
{pagination_limit, find_match_fn}
_ ->
{elem(pagination, 0),
fn total, conversion ->
total[property_atom] == conversion[property_atom]
end}
end
defp on_matches_group_by(fields) do pagination = {pagination_limit, page}
Enum.reduce(fields, nil, &fields_equal/2)
end res_without_goal = breakdown(site, query_without_goal, property, [:visitors], pagination)
Enum.map(breakdown_results, fn item ->
without_goal = Enum.find(res_without_goal, &find_match_fn.(&1, item))
{conversion_rate, total_visitors} =
if without_goal do
{Util.calculate_cr(without_goal.visitors, item.visitors), without_goal.visitors}
else
Sentry.capture_message(
"Unable to find a conversion_rate divisor from a breakdown response",
extra: %{
domain: site.domain,
query: inspect(query),
property: property,
pagination: inspect(pagination),
item_not_found: inspect(item)
}
)
defp outer_order_by(fields) do {"N/A", "N/A"}
Enum.map(fields, fn field_name -> {:asc, dynamic([q], field(q, ^field_name))} end) end
if :total_visitors in metrics do
item
|> Map.put(:conversion_rate, conversion_rate)
|> Map.put(:total_visitors, total_visitors)
else
Map.put(item, :conversion_rate, conversion_rate)
end
end)
end end
defp fields_equal(field_name, nil), # Similar to `add_cr/5`, injects a conversion_rate metric into
do: dynamic([a, b], field(a, ^field_name) == field(b, ^field_name)) # every breakdown result. However, a single divisor is used in
# the CR calculation across all breakdown results. That is the
# number of visitors without `event:goal` and `event:props:*`
# filters.
#
# This is useful when we're only interested in the conversions
# themselves - not how well a certain property such as browser
# or page converted.
defp add_absolute_cr(breakdown_results, site, query) do
total_q = Query.remove_event_filters(query, [:goal, :props])
%{visitors: %{value: total_visitors}} = Plausible.Stats.aggregate(site, total_q, [:visitors])
defp fields_equal(field_name, condition), breakdown_results
do: dynamic([a, b], field(a, ^field_name) == field(b, ^field_name) and ^condition) |> Enum.map(fn goal ->
Map.put(goal, :conversion_rate, Util.calculate_cr(total_visitors, goal[:visitors]))
end)
end
defp sort_results(results, metrics) do defp sort_results(results, metrics) do
Enum.sort_by( Enum.sort_by(
@ -650,54 +790,6 @@ defmodule Plausible.Stats.Breakdown do
) )
end end
# This function injects a conversion_rate metric into
# a breakdown query. It is calculated as X / Y, where:
#
# * X is the number of conversions for a breakdown
# result (conversion = number of visitors who
# completed the filtered goal with the filtered
# custom properties).
#
# * Y is the number of all visitors for this breakdown
# result without the `event:goal` and `event:props:*`
# filters.
defp maybe_add_group_conversion_rate(q, breakdown_fn, site, query, property, metrics) do
if :conversion_rate in metrics do
breakdown_total_visitors_query = query |> Query.remove_event_filters([:goal, :props])
breakdown_total_visitors_q =
breakdown_fn.(site, breakdown_total_visitors_query, property, [:visitors])
from(e in subquery(q),
left_join: c in subquery(breakdown_total_visitors_q),
on: ^on_matches_group_by(group_by_field_names(property)),
select_merge: %{
total_visitors: c.visitors,
conversion_rate:
fragment(
"if(? > 0, round(? / ? * 100, 1), 0)",
c.visitors,
e.visitors,
c.visitors
)
},
order_by: [desc: e.visitors],
order_by: ^outer_order_by(group_by_field_names(property))
)
else
q
end
end
# When querying custom event goals and pageviewgoals together, UNION ALL is used
# so the same fields must be present on both sides of the union. This change to the
# query will ensure that we don't unnecessarily read revenue column for pageview goals
defp mark_revenue_as_nil(select_columns) do
select_columns
|> Map.replace(:total_revenue, nil)
|> Map.replace(:average_revenue, nil)
end
defp sorting_key(metrics) do defp sorting_key(metrics) do
if Enum.member?(metrics, :visitors), do: :visitors, else: List.first(metrics) if Enum.member?(metrics, :visitors), do: :visitors, else: List.first(metrics)
end end
@ -715,8 +807,8 @@ defmodule Plausible.Stats.Breakdown do
offset = (page - 1) * limit offset = (page - 1) * limit
q q
|> limit(^limit) |> Ecto.Query.limit(^limit)
|> offset(^offset) |> Ecto.Query.offset(^offset)
end end
defp trace(query, property, metrics) do defp trace(query, property, metrics) do

@ -4,7 +4,9 @@ defmodule Plausible.Stats.Compare do
end end
def calculate_change(:bounce_rate, old_count, new_count) do def calculate_change(:bounce_rate, old_count, new_count) do
if old_count > 0, do: new_count - old_count if is_integer(old_count) && is_integer(new_count) && old_count > 0 do
new_count - old_count
end
end end
def calculate_change(_metric, old_count, new_count) do def calculate_change(_metric, old_count, new_count) do

@ -208,12 +208,11 @@ defmodule Plausible.Stats.FilterSuggestions do
"operating_system" -> :operating_system "operating_system" -> :operating_system
"operating_system_version" -> :operating_system_version "operating_system_version" -> :operating_system_version
"screen_size" -> :screen_size "screen_size" -> :screen_size
"hostname" -> :hostname
_ -> :unknown _ -> :unknown
end end
q = q =
if(filter_name == :pathname or filter_name == :hostname, if(filter_name == :pathname,
do: base_event_query(site, query), do: base_event_query(site, query),
else: query_sessions(site, query) else: query_sessions(site, query)
) )
@ -231,12 +230,6 @@ defmodule Plausible.Stats.FilterSuggestions do
where: fragment("? ilike ?", e.pathname, ^filter_query) where: fragment("? ilike ?", e.pathname, ^filter_query)
) )
:hostname ->
from(e in q,
select: e.hostname,
where: fragment("? ilike ?", e.hostname, ^filter_query)
)
:entry_page -> :entry_page ->
from(e in q, from(e in q,
select: e.entry_page, select: e.entry_page,

@ -31,7 +31,7 @@ defmodule Plausible.Stats.Filters.DashboardFilterParser do
{is_negated, val} = parse_negated_prefix(val) {is_negated, val} = parse_negated_prefix(val)
{is_contains, val} = parse_contains_prefix(val) {is_contains, val} = parse_contains_prefix(val)
is_list = list_expression?(val) is_list = list_expression?(val)
is_wildcard = String.contains?(key, ["page", "goal", "hostname"]) && wildcard_expression?(val) is_wildcard = String.contains?(key, ["page", "goal"]) && wildcard_expression?(val)
val = if is_list, do: parse_member_list(val), else: remove_escape_chars(val) val = if is_list, do: parse_member_list(val), else: remove_escape_chars(val)
val = if key == "goal", do: wrap_goal_value(val), else: val val = if key == "goal", do: wrap_goal_value(val), else: val

@ -23,22 +23,11 @@ defmodule Plausible.Stats.Filters do
:region, :region,
:city, :city,
:entry_page, :entry_page,
:exit_page, :exit_page
:entry_page_hostname,
:exit_page_hostname
] ]
def visit_props(), do: @visit_props |> Enum.map(&to_string/1) def visit_props(), do: @visit_props |> Enum.map(&to_string/1)
@event_table_visit_props @visit_props -- @event_props [:name, :page, :goal]
[
:entry_page,
:exit_page,
:entry_page_hostname,
:exit_page_hostname
]
def event_table_visit_props(), do: @event_table_visit_props |> Enum.map(&to_string/1)
@event_props [:name, :page, :goal, :hostname]
def event_props(), do: @event_props |> Enum.map(&to_string/1) def event_props(), do: @event_props |> Enum.map(&to_string/1)

@ -488,15 +488,7 @@ defmodule Plausible.Stats.Imported do
|> select_merge([s, i], %{ |> select_merge([s, i], %{
views_per_visit: views_per_visit:
fragment( fragment(
""" "round((? + ? * coalesce(?, 0)) / (coalesce(?, 0) + coalesce(?, 0)), 2)",
if(
coalesce(?, 0) + coalesce(?, 0) > 0,
round((? + ? * coalesce(?, 0)) / (coalesce(?, 0) + coalesce(?, 0)), 2),
0
)
""",
s.__internal_visits,
i.__internal_visits,
i.pageviews, i.pageviews,
s.views_per_visit, s.views_per_visit,
s.__internal_visits, s.__internal_visits,
@ -512,15 +504,7 @@ defmodule Plausible.Stats.Imported do
|> select_merge([s, i], %{ |> select_merge([s, i], %{
bounce_rate: bounce_rate:
fragment( fragment(
""" "round(100 * (coalesce(?, 0) + coalesce((? * ? / 100), 0)) / (coalesce(?, 0) + coalesce(?, 0)))",
if(
coalesce(?, 0) + coalesce(?, 0) > 0,
round(100 * (coalesce(?, 0) + coalesce((? * ? / 100), 0)) / (coalesce(?, 0) + coalesce(?, 0))),
0
)
""",
s.__internal_visits,
i.__internal_visits,
i.bounces, i.bounces,
s.bounce_rate, s.bounce_rate,
s.__internal_visits, s.__internal_visits,
@ -536,15 +520,7 @@ defmodule Plausible.Stats.Imported do
|> select_merge([s, i], %{ |> select_merge([s, i], %{
visit_duration: visit_duration:
fragment( fragment(
""" "round((? + ? * ?) / (? + ?), 1)",
if(
? + ? > 0,
round((? + ? * ?) / (? + ?), 1),
0
)
""",
s.__internal_visits,
i.__internal_visits,
i.visit_duration, i.visit_duration,
s.visit_duration, s.visit_duration,
s.__internal_visits, s.__internal_visits,

@ -1,27 +0,0 @@
defmodule Plausible.Stats.Metrics do
@moduledoc """
A module listing all available metrics in Plausible.
Useful for an explicit string to atom conversion.
"""
use Plausible
@all_metrics [
:visitors,
:visits,
:pageviews,
:views_per_visit,
:bounce_rate,
:visit_duration,
:events,
:conversion_rate,
:time_on_page
] ++ on_full_build(do: Plausible.Stats.Goal.Revenue.revenue_metrics(), else: [])
@metric_mappings Enum.into(@all_metrics, %{}, fn metric -> {to_string(metric), metric} end)
def from_string!(str) do
Map.fetch!(@metric_mappings, str)
end
end

@ -9,8 +9,7 @@ defmodule Plausible.Stats.Query do
imported_data_requested: false, imported_data_requested: false,
include_imported: false, include_imported: false,
now: nil, now: nil,
experimental_session_count?: false, experimental_session_count?: false
experimental_reduced_joins?: false
require OpenTelemetry.Tracer, as: Tracer require OpenTelemetry.Tracer, as: Tracer
alias Plausible.Stats.{Filters, Interval} alias Plausible.Stats.{Filters, Interval}
@ -23,8 +22,7 @@ defmodule Plausible.Stats.Query do
query = query =
__MODULE__ __MODULE__
|> struct!(now: now) |> struct!(now: now)
|> put_experimental_session_count(site, params) |> put_experimental_session_count(params)
|> put_experimental_reduced_joins(site, params)
|> put_period(site, params) |> put_period(site, params)
|> put_interval(params) |> put_interval(params)
|> put_parsed_filters(params) |> put_parsed_filters(params)
@ -38,27 +36,11 @@ defmodule Plausible.Stats.Query do
query query
end end
defp put_experimental_session_count(query, site, params) do defp put_experimental_session_count(query, params) do
if Map.has_key?(params, "experimental_session_count") do if Map.get(params, "experimental_session_count") == "true" do
struct!(query, struct!(query, experimental_session_count?: true)
experimental_session_count?: Map.get(params, "experimental_session_count") == "true"
)
else else
struct!(query, query
experimental_session_count?: FunWithFlags.enabled?(:experimental_session_count, for: site)
)
end
end
defp put_experimental_reduced_joins(query, site, params) do
if Map.has_key?(params, "experimental_reduced_joins") do
struct!(query,
experimental_reduced_joins?: Map.get(params, "experimental_reduced_joins") == "true"
)
else
struct!(query,
experimental_reduced_joins?: FunWithFlags.enabled?(:experimental_reduced_joins, for: site)
)
end end
end end
@ -279,8 +261,8 @@ defmodule Plausible.Stats.Query do
@spec include_imported?(t(), Plausible.Site.t(), boolean()) :: boolean() @spec include_imported?(t(), Plausible.Site.t(), boolean()) :: boolean()
def include_imported?(query, site, requested?) do def include_imported?(query, site, requested?) do
cond do cond do
is_nil(site.latest_import_end_date) -> false is_nil(site.earliest_import_end_date) -> false
Date.after?(query.date_range.first, site.latest_import_end_date) -> false Date.after?(query.date_range.first, site.earliest_import_end_date) -> false
Enum.any?(query.filters) -> false Enum.any?(query.filters) -> false
query.period == "realtime" -> false query.period == "realtime" -> false
true -> requested? true -> requested?

@ -1,111 +0,0 @@
defmodule Plausible.Stats.TableDecider do
@moduledoc """
This module contains logic for deciding which tables need to be queried given a query
and metrics, with the purpose of reducing the number of queries and JOINs needed to perform.
"""
import Enum, only: [empty?: 1]
alias Plausible.Stats.Query
def events_join_sessions?(query) do
Enum.any?(query.filters, &(filters_partitioner(query, &1) == :session))
end
def partition_metrics(metrics, query, breakdown_property \\ nil) do
%{
event: event_only_metrics,
session: session_only_metrics,
either: either_metrics,
other: other_metrics,
sample_percent: sample_percent
} =
partition(metrics, query, &metric_partitioner/2)
# Treat breakdown property as yet another filter
filters =
if breakdown_property do
Map.put(query.filters, breakdown_property, nil)
else
query.filters
end
%{event: event_only_filters, session: session_only_filters} =
partition(filters, query, &filters_partitioner/2)
cond do
# Only one table needs to be queried
empty?(event_only_metrics) && empty?(event_only_filters) ->
{[], session_only_metrics ++ either_metrics ++ sample_percent, other_metrics}
empty?(session_only_metrics) && empty?(session_only_filters) ->
{event_only_metrics ++ either_metrics ++ sample_percent, [], other_metrics}
# Filters on both events and sessions, but only one kind of metric
empty?(event_only_metrics) ->
{[], session_only_metrics ++ either_metrics ++ sample_percent, other_metrics}
empty?(session_only_metrics) ->
{event_only_metrics ++ either_metrics ++ sample_percent, [], other_metrics}
# Default: prefer sessions
true ->
{event_only_metrics ++ sample_percent,
session_only_metrics ++ either_metrics ++ sample_percent, other_metrics}
end
end
defp metric_partitioner(_, :conversion_rate), do: :event
defp metric_partitioner(_, :average_revenue), do: :event
defp metric_partitioner(_, :total_revenue), do: :event
defp metric_partitioner(_, :pageviews), do: :event
defp metric_partitioner(_, :events), do: :event
defp metric_partitioner(_, :bounce_rate), do: :session
defp metric_partitioner(_, :visit_duration), do: :session
defp metric_partitioner(_, :views_per_visit), do: :session
# Metrics which used to only be queried from one table but can be calculated from either
defp metric_partitioner(%Query{experimental_reduced_joins?: true}, :visits), do: :either
defp metric_partitioner(%Query{experimental_reduced_joins?: true}, :visitors), do: :either
defp metric_partitioner(_, :visits), do: :session
defp metric_partitioner(_, :visitors), do: :event
# Calculated metrics - handled on callsite separately from other metrics.
defp metric_partitioner(_, :time_on_page), do: :other
defp metric_partitioner(_, :total_visitors), do: :other
defp metric_partitioner(_, :percentage), do: :other
# Sample percentage is included in both tables if queried.
defp metric_partitioner(_, :sample_percent), do: :sample_percent
defp metric_partitioner(%Query{experimental_reduced_joins?: false}, unknown) do
raise ArgumentError, "Metric #{unknown} not supported without experimental_reduced_joins?"
end
defp metric_partitioner(_, _), do: :either
defp filters_partitioner(_, {"event:" <> _, _}), do: :event
defp filters_partitioner(_, {"visit:entry_page", _}), do: :session
defp filters_partitioner(_, {"visit:entry_page_hostname", _}), do: :session
defp filters_partitioner(_, {"visit:exit_page", _}), do: :session
defp filters_partitioner(_, {"visit:exit_page_hostname", _}), do: :session
defp filters_partitioner(%Query{experimental_reduced_joins?: true}, {"visit:" <> _, _}),
do: :either
defp filters_partitioner(_, {"visit:" <> _, _}),
do: :session
defp filters_partitioner(%Query{experimental_reduced_joins?: false}, {unknown, _}) do
raise ArgumentError, "Filter #{unknown} not supported without experimental_reduced_joins?"
end
defp filters_partitioner(_, _), do: :either
@default %{event: [], session: [], either: [], other: [], sample_percent: []}
defp partition(values, query, partitioner) do
Enum.reduce(values, @default, fn value, acc ->
key = partitioner.(query, value)
Map.put(acc, key, Map.fetch!(acc, key) ++ [value])
end)
end
end

@ -3,12 +3,10 @@ defmodule Plausible.Stats.Timeseries do
use Plausible use Plausible
alias Plausible.Stats.{Query, Util} alias Plausible.Stats.{Query, Util}
import Plausible.Stats.{Base} import Plausible.Stats.{Base}
import Ecto.Query
use Plausible.Stats.Fragments use Plausible.Stats.Fragments
@typep metric :: @typep metric ::
:pageviews :pageviews
| :events
| :visitors | :visitors
| :visits | :visits
| :bounce_rate | :bounce_rate
@ -18,11 +16,15 @@ defmodule Plausible.Stats.Timeseries do
@typep value :: nil | integer() | float() @typep value :: nil | integer() | float()
@type results :: nonempty_list(%{required(:date) => Date.t(), required(metric()) => value()}) @type results :: nonempty_list(%{required(:date) => Date.t(), required(metric()) => value()})
@revenue_metrics on_full_build(do: Plausible.Stats.Goal.Revenue.revenue_metrics(), else: [])
@event_metrics [:visitors, :pageviews, :events] ++ @revenue_metrics
@session_metrics [:visits, :bounce_rate, :visit_duration, :views_per_visit]
def timeseries(site, query, metrics) do def timeseries(site, query, metrics) do
steps = buckets(query) steps = buckets(query)
{event_metrics, session_metrics, _} = event_metrics = Enum.filter(metrics, &(&1 in @event_metrics))
Plausible.Stats.TableDecider.partition_metrics(metrics, query) session_metrics = Enum.filter(metrics, &(&1 in @session_metrics))
{currency, event_metrics} = {currency, event_metrics} =
on_full_build do on_full_build do
@ -46,17 +48,14 @@ defmodule Plausible.Stats.Timeseries do
|> Map.update!(:date, &date_format/1) |> Map.update!(:date, &date_format/1)
|> cast_revenue_metrics_to_money(currency) |> cast_revenue_metrics_to_money(currency)
end) end)
|> Util.keep_requested_metrics(metrics)
end end
defp events_timeseries(_, _, []), do: [] defp events_timeseries(_, _, []), do: []
defp events_timeseries(site, query, metrics) do defp events_timeseries(site, query, metrics) do
metrics = Util.maybe_add_visitors_metric(metrics) from(e in base_event_query(site, query), select: %{})
from(e in base_event_query(site, query), select: ^select_event_metrics(metrics))
|> select_bucket(site, query) |> select_bucket(site, query)
|> maybe_add_timeseries_conversion_rate(site, query, metrics) |> select_event_metrics(metrics)
|> Plausible.Stats.Imported.merge_imported_timeseries(site, query, metrics) |> Plausible.Stats.Imported.merge_imported_timeseries(site, query, metrics)
|> ClickhouseRepo.all() |> ClickhouseRepo.all()
end end
@ -64,9 +63,10 @@ defmodule Plausible.Stats.Timeseries do
defp sessions_timeseries(_, _, []), do: [] defp sessions_timeseries(_, _, []), do: []
defp sessions_timeseries(site, query, metrics) do defp sessions_timeseries(site, query, metrics) do
from(e in query_sessions(site, query), select: ^select_session_metrics(metrics, query)) from(e in query_sessions(site, query), select: %{})
|> filter_converted_sessions(site, query) |> filter_converted_sessions(site, query)
|> select_bucket(site, query) |> select_bucket(site, query)
|> select_session_metrics(metrics, query)
|> Plausible.Stats.Imported.merge_imported_timeseries(site, query, metrics) |> Plausible.Stats.Imported.merge_imported_timeseries(site, query, metrics)
|> ClickhouseRepo.all() |> ClickhouseRepo.all()
|> Util.keep_requested_metrics(metrics) |> Util.keep_requested_metrics(metrics)
@ -236,7 +236,6 @@ defmodule Plausible.Stats.Timeseries do
:visitors -> Map.merge(row, %{visitors: 0}) :visitors -> Map.merge(row, %{visitors: 0})
:visits -> Map.merge(row, %{visits: 0}) :visits -> Map.merge(row, %{visits: 0})
:views_per_visit -> Map.merge(row, %{views_per_visit: 0.0}) :views_per_visit -> Map.merge(row, %{views_per_visit: 0.0})
:conversion_rate -> Map.merge(row, %{conversion_rate: 0.0})
:bounce_rate -> Map.merge(row, %{bounce_rate: nil}) :bounce_rate -> Map.merge(row, %{bounce_rate: nil})
:visit_duration -> Map.merge(row, %{visit_duration: nil}) :visit_duration -> Map.merge(row, %{visit_duration: nil})
:average_revenue -> Map.merge(row, %{average_revenue: nil}) :average_revenue -> Map.merge(row, %{average_revenue: nil})
@ -252,33 +251,4 @@ defmodule Plausible.Stats.Timeseries do
else else
defp cast_revenue_metrics_to_money(results, _revenue_goals), do: results defp cast_revenue_metrics_to_money(results, _revenue_goals), do: results
end end
defp maybe_add_timeseries_conversion_rate(q, site, query, metrics) do
if :conversion_rate in metrics do
totals_query = query |> Query.remove_event_filters([:goal, :props])
totals_timeseries_q =
from(e in base_event_query(site, totals_query),
select: ^select_event_metrics([:visitors])
)
|> select_bucket(site, query)
from(e in subquery(q),
left_join: c in subquery(totals_timeseries_q),
on: e.date == c.date,
select_merge: %{
total_visitors: c.visitors,
conversion_rate:
fragment(
"if(? > 0, round(? / ? * 100, 1), 0)",
c.visitors,
e.visitors,
c.visitors
)
}
)
else
q
end
end
end end

@ -7,8 +7,7 @@ defmodule Plausible.Stats.Util do
:__internal_visits, :__internal_visits,
:visitors, :visitors,
:__total_visitors, :__total_visitors,
:__breakdown_value, :__breakdown_value
:total_visitors
] ]
@doc """ @doc """
@ -49,4 +48,12 @@ defmodule Plausible.Stats.Util do
metrics metrics
end end
end end
def calculate_cr(nil, _converted_visitors), do: nil
def calculate_cr(unique_visitors, converted_visitors) do
if unique_visitors > 0,
do: Float.round(converted_visitors / unique_visitors * 100, 1),
else: 0.0
end
end end

@ -47,16 +47,6 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do
unit: {:native, :millisecond}, unit: {:native, :millisecond},
measurement: :duration measurement: :duration
), ),
distribution(
metric_prefix ++ [:ingest, :events, :pipeline, :steps],
event_name: Ingestion.Event.telemetry_pipeline_step_duration(),
reporter_options: [
buckets: [10, 50, 100, 250, 350, 500, 1000, 5000, 10_000, 100_000, 500_000]
],
unit: {:native, :microsecond},
measurement: :duration,
tags: [:step]
),
counter( counter(
metric_prefix ++ [:ingest, :events, :buffered, :total], metric_prefix ++ [:ingest, :events, :buffered, :total],
event_name: Ingestion.Event.telemetry_event_buffered() event_name: Ingestion.Event.telemetry_event_buffered()
@ -120,19 +110,6 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do
}) })
end end
def measure_duration(event, fun, meta \\ %{}) when is_function(fun, 0) do
{duration, result} = time_it(fun)
:telemetry.execute(event, %{duration: duration}, meta)
result
end
defp time_it(fun) do
start = System.monotonic_time()
result = fun.()
stop = System.monotonic_time()
{stop - start, result}
end
defp write_buffer_metrics(metric_prefix, poll_rate) do defp write_buffer_metrics(metric_prefix, poll_rate) do
Polling.build( Polling.build(
:write_buffer_metrics, :write_buffer_metrics,

@ -1,50 +0,0 @@
defmodule PlausibleWeb.Components.FirstDashboardLaunchBanner do
@moduledoc """
A banner that appears on the first dashboard launch
"""
use Phoenix.Component
use Phoenix.HTML
attr(:site, Plausible.Site, required: true)
def set(assigns) do
~H"""
<script>
sessionStorage.setItem('<%= storage_key(@site) %>', false);
</script>
"""
end
attr(:site, Plausible.Site, required: true)
def render(assigns) do
~H"""
<div
x-cloak
x-data={x_data(@site)}
class="w-full px-4 text-sm font-bold text-center text-blue-900 bg-blue-200 rounded transition"
style="top: 91px"
role="alert"
x-bind:class="! show ? 'hidden' : ''"
x-init={x_init(@site)}
>
<%= link("Team members, email reports and GA import. Explore more →",
to: "/#{URI.encode_www_form(@site.domain)}/settings/email-reports",
class: "py-2 block"
) %>
</div>
"""
end
defp x_data(site) do
"{show: !!sessionStorage.getItem('#{storage_key(site)}')}"
end
defp x_init(site) do
"setTimeout(() => sessionStorage.removeItem('#{storage_key(site)}'), 3000)"
end
defp storage_key(site) do
"dashboard_seen_#{site.domain}"
end
end

@ -2,7 +2,21 @@ defmodule PlausibleWeb.Api.ExternalStatsController do
use PlausibleWeb, :controller use PlausibleWeb, :controller
use Plausible.Repo use Plausible.Repo
use PlausibleWeb.Plugs.ErrorHandler use PlausibleWeb.Plugs.ErrorHandler
alias Plausible.Stats.{Query, Compare, Comparisons, Metrics} alias Plausible.Stats.{Query, Compare, Comparisons}
@metrics [
:visitors,
:visits,
:pageviews,
:views_per_visit,
:bounce_rate,
:visit_duration,
:events,
:conversion_rate,
:time_on_page
]
@metric_mappings Enum.into(@metrics, %{}, fn metric -> {to_string(metric), metric} end)
def realtime_visitors(conn, _params) do def realtime_visitors(conn, _params) do
site = conn.assigns.site site = conn.assigns.site
@ -103,7 +117,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController do
{:error, reason} {:error, reason}
metrics -> metrics ->
{:ok, Enum.map(metrics, &Metrics.from_string!/1)} {:ok, Enum.map(metrics, &Map.fetch!(@metric_mappings, &1))}
end end
end end

@ -4,6 +4,7 @@ defmodule PlausibleWeb.Api.StatsController do
use Plausible.Repo use Plausible.Repo
use PlausibleWeb.Plugs.ErrorHandler use PlausibleWeb.Plugs.ErrorHandler
alias Plausible.Imported.SiteImport
alias Plausible.Stats alias Plausible.Stats
alias Plausible.Stats.{Query, Comparisons} alias Plausible.Stats.{Query, Comparisons}
alias PlausibleWeb.Api.Helpers, as: H alias PlausibleWeb.Api.Helpers, as: H
@ -12,7 +13,7 @@ defmodule PlausibleWeb.Api.StatsController do
@revenue_metrics on_full_build(do: Plausible.Stats.Goal.Revenue.revenue_metrics(), else: []) @revenue_metrics on_full_build(do: Plausible.Stats.Goal.Revenue.revenue_metrics(), else: [])
plug(:date_validation_plug) plug(:validate_common_input)
@doc """ @doc """
Returns a time-series based on given parameters. Returns a time-series based on given parameters.
@ -67,8 +68,8 @@ defmodule PlausibleWeb.Api.StatsController do
* `with_imported` - boolean indicating whether the Google Analytics data * `with_imported` - boolean indicating whether the Google Analytics data
was queried or not. was queried or not.
* `imports_exist` - boolean indicating whether there are any completed * `imported_source` - the source of the imported data, when applicable.
imports for a given site or not. Currently only Google Analytics is supported.
* `full_intervals` - map of dates indicating whether the interval has been * `full_intervals` - map of dates indicating whether the interval has been
cut off by the requested date range or not. For example, if looking at a cut off by the requested date range or not. For example, if looking at a
@ -86,7 +87,7 @@ defmodule PlausibleWeb.Api.StatsController do
"2021-11-01" => true, "2021-11-01" => true,
"2021-12-01" => false "2021-12-01" => false
}, },
"imports_exist" => false, "imported_source" => nil,
"interval" => "month", "interval" => "month",
"labels" => ["2021-09-01", "2021-10-01", "2021-11-01", "2021-12-01"], "labels" => ["2021-09-01", "2021-10-01", "2021-11-01", "2021-12-01"],
"plot" => [0, 0, 0, 0], "plot" => [0, 0, 0, 0],
@ -99,11 +100,16 @@ defmodule PlausibleWeb.Api.StatsController do
def main_graph(conn, params) do def main_graph(conn, params) do
site = conn.assigns[:site] site = conn.assigns[:site]
with {:ok, dates} <- parse_date_params(params), with :ok <- validate_params(site, params) do
:ok <- validate_interval(params), query = Query.from(site, params)
:ok <- validate_interval_granularity(site, params, dates),
query = Query.from(site, params), selected_metric =
{:ok, metric} <- parse_and_validate_graph_metric(params, query) do if !params["metric"] || params["metric"] == "conversions" do
:visitors
else
String.to_existing_atom(params["metric"])
end
timeseries_query = timeseries_query =
if query.period == "realtime" do if query.period == "realtime" do
%Query{query | period: "30m"} %Query{query | period: "30m"}
@ -111,14 +117,14 @@ defmodule PlausibleWeb.Api.StatsController do
query query
end end
timeseries_result = Stats.timeseries(site, timeseries_query, [metric]) timeseries_result = Stats.timeseries(site, timeseries_query, [selected_metric])
comparison_opts = parse_comparison_opts(params) comparison_opts = parse_comparison_opts(params)
{comparison_query, comparison_result} = {comparison_query, comparison_result} =
case Comparisons.compare(site, query, params["comparison"], comparison_opts) do case Comparisons.compare(site, query, params["comparison"], comparison_opts) do
{:ok, comparison_query} -> {:ok, comparison_query} ->
{comparison_query, Stats.timeseries(site, comparison_query, [metric])} {comparison_query, Stats.timeseries(site, comparison_query, [selected_metric])}
{:error, :not_supported} -> {:error, :not_supported} ->
{nil, nil} {nil, nil}
@ -128,16 +134,17 @@ defmodule PlausibleWeb.Api.StatsController do
present_index = present_index_for(site, query, labels) present_index = present_index_for(site, query, labels)
full_intervals = build_full_intervals(query, labels) full_intervals = build_full_intervals(query, labels)
site_import = Plausible.Imported.get_earliest_import(site)
json(conn, %{ json(conn, %{
metric: metric, plot: plot_timeseries(timeseries_result, selected_metric),
plot: plot_timeseries(timeseries_result, metric),
labels: labels, labels: labels,
comparison_plot: comparison_result && plot_timeseries(comparison_result, metric), comparison_plot: comparison_result && plot_timeseries(comparison_result, selected_metric),
comparison_labels: comparison_result && label_timeseries(comparison_result, nil), comparison_labels: comparison_result && label_timeseries(comparison_result, nil),
present_index: present_index, present_index: present_index,
interval: query.interval, interval: query.interval,
with_imported: with_imported?(query, comparison_query), with_imported: with_imported?(query, comparison_query),
imports_exist: site.complete_import_ids != [], imported_source: site_import && SiteImport.label(site_import),
full_intervals: full_intervals full_intervals: full_intervals
}) })
else else
@ -200,29 +207,35 @@ defmodule PlausibleWeb.Api.StatsController do
def top_stats(conn, params) do def top_stats(conn, params) do
site = conn.assigns[:site] site = conn.assigns[:site]
query = Query.from(site, params) with :ok <- validate_params(site, params) do
query = Query.from(site, params)
comparison_opts = parse_comparison_opts(params) comparison_opts = parse_comparison_opts(params)
comparison_query = comparison_query =
case Stats.Comparisons.compare(site, query, params["comparison"], comparison_opts) do case Stats.Comparisons.compare(site, query, params["comparison"], comparison_opts) do
{:ok, query} -> query {:ok, query} -> query
{:error, _cause} -> nil {:error, _cause} -> nil
end end
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_query)
site_import = Plausible.Imported.get_earliest_import(site)
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_query) json(conn, %{
top_stats: top_stats,
json(conn, %{ interval: query.interval,
top_stats: top_stats, sample_percent: sample_percent,
interval: query.interval, with_imported: with_imported?(query, comparison_query),
sample_percent: sample_percent, imported_source: site_import && SiteImport.label(site_import),
with_imported: with_imported?(query, comparison_query), comparing_from: comparison_query && comparison_query.date_range.first,
imports_exist: site.complete_import_ids != [], comparing_to: comparison_query && comparison_query.date_range.last,
comparing_from: comparison_query && comparison_query.date_range.first, from: query.date_range.first,
comparing_to: comparison_query && comparison_query.date_range.last, to: query.date_range.last
from: query.date_range.first, })
to: query.date_range.last else
}) {:error, message} when is_binary(message) -> bad_request(conn, message)
end
end end
defp present_index_for(site, query, dates) do defp present_index_for(site, query, dates) do
@ -295,12 +308,10 @@ defmodule PlausibleWeb.Api.StatsController do
}, },
%{ %{
name: "Unique conversions (last 30 min)", name: "Unique conversions (last 30 min)",
graph_metric: :visitors,
value: unique_conversions value: unique_conversions
}, },
%{ %{
name: "Total conversions (last 30 min)", name: "Total conversions (last 30 min)",
graph_metric: :events,
value: total_conversions value: total_conversions
} }
] ]
@ -323,12 +334,10 @@ defmodule PlausibleWeb.Api.StatsController do
}, },
%{ %{
name: "Unique visitors (last 30 min)", name: "Unique visitors (last 30 min)",
graph_metric: :visitors,
value: visitors value: visitors
}, },
%{ %{
name: "Pageviews (last 30 min)", name: "Pageviews (last 30 min)",
graph_metric: :pageviews,
value: pageviews value: pageviews
} }
] ]
@ -345,21 +354,15 @@ defmodule PlausibleWeb.Api.StatsController do
[ [
top_stats_entry(results, comparison, "Unique visitors", :total_visitors), top_stats_entry(results, comparison, "Unique visitors", :total_visitors),
top_stats_entry(results, comparison, "Unique conversions", :visitors, graphable?: true), top_stats_entry(results, comparison, "Unique conversions", :visitors),
top_stats_entry(results, comparison, "Total conversions", :events, graphable?: true), top_stats_entry(results, comparison, "Total conversions", :events),
on_full_build do on_full_build do
top_stats_entry(results, comparison, "Average revenue", :average_revenue, top_stats_entry(results, comparison, "Average revenue", :average_revenue, &format_money/1)
formatter: &format_money/1,
graphable?: true
)
end, end,
on_full_build do on_full_build do
top_stats_entry(results, comparison, "Total revenue", :total_revenue, top_stats_entry(results, comparison, "Total revenue", :total_revenue, &format_money/1)
formatter: &format_money/1,
graphable?: true
)
end, end,
top_stats_entry(results, comparison, "Conversion rate", :conversion_rate, graphable?: true) top_stats_entry(results, comparison, "Conversion rate", :conversion_rate)
] ]
|> Enum.reject(&is_nil/1) |> Enum.reject(&is_nil/1)
|> then(&{&1, 100}) |> then(&{&1, 100})
@ -393,63 +396,39 @@ defmodule PlausibleWeb.Api.StatsController do
stats = stats =
[ [
top_stats_entry(current_results, prev_results, "Unique visitors", :visitors, top_stats_entry(current_results, prev_results, "Unique visitors", :visitors),
graphable?: true top_stats_entry(current_results, prev_results, "Total visits", :visits),
), top_stats_entry(current_results, prev_results, "Total pageviews", :pageviews),
top_stats_entry(current_results, prev_results, "Total visits", :visits, graphable?: true), top_stats_entry(current_results, prev_results, "Views per visit", :views_per_visit),
top_stats_entry(current_results, prev_results, "Total pageviews", :pageviews, top_stats_entry(current_results, prev_results, "Bounce rate", :bounce_rate),
graphable?: true top_stats_entry(current_results, prev_results, "Visit duration", :visit_duration),
), top_stats_entry(current_results, prev_results, "Time on page", :time_on_page, fn
top_stats_entry(current_results, prev_results, "Views per visit", :views_per_visit, nil -> 0
graphable?: true value -> value
), end)
top_stats_entry(current_results, prev_results, "Bounce rate", :bounce_rate,
graphable?: true
),
top_stats_entry(current_results, prev_results, "Visit duration", :visit_duration,
graphable?: true
),
top_stats_entry(current_results, prev_results, "Time on page", :time_on_page,
formatter: fn
nil -> 0
value -> value
end
)
] ]
|> Enum.filter(& &1) |> Enum.filter(& &1)
{stats, current_results[:sample_percent][:value]} {stats, current_results[:sample_percent][:value]}
end end
defp top_stats_entry(current_results, prev_results, name, key, opts \\ []) do defp top_stats_entry(current_results, prev_results, name, key, formatter \\ & &1) do
if current_results[key] do if current_results[key] do
formatter = Keyword.get(opts, :formatter, & &1)
value = get_in(current_results, [key, :value]) value = get_in(current_results, [key, :value])
%{name: name, value: formatter.(value)} if prev_results do
|> maybe_put_graph_metric(opts, key) prev_value = get_in(prev_results, [key, :value])
|> maybe_put_comparison(prev_results, key, value, formatter) change = Stats.Compare.calculate_change(key, prev_value, value)
end
end
defp maybe_put_graph_metric(entry, opts, key) do
if Keyword.get(opts, :graphable?) do
entry |> Map.put(:graph_metric, key)
else
entry
end
end
defp maybe_put_comparison(entry, prev_results, key, value, formatter) do
if prev_results do
prev_value = get_in(prev_results, [key, :value])
change = Stats.Compare.calculate_change(key, prev_value, value)
entry %{
|> Map.put(:comparison_value, formatter.(prev_value)) name: name,
|> Map.put(:change, change) value: formatter.(value),
else comparison_value: formatter.(prev_value),
entry change: change
}
else
%{name: name, value: formatter.(value)}
end
end end
end end
@ -458,13 +437,6 @@ defmodule PlausibleWeb.Api.StatsController do
query = Query.from(site, params) query = Query.from(site, params)
pagination = parse_pagination(params) pagination = parse_pagination(params)
query =
if query.filters["event:hostname"] do
Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"])
else
query
end
extra_metrics = extra_metrics =
if params["detailed"], do: [:bounce_rate, :visit_duration], else: [] if params["detailed"], do: [:bounce_rate, :visit_duration], else: []
@ -492,6 +464,7 @@ defmodule PlausibleWeb.Api.StatsController do
site = Plausible.Repo.preload(conn.assigns.site, :owner) site = Plausible.Repo.preload(conn.assigns.site, :owner)
with :ok <- Plausible.Billing.Feature.Funnels.check_availability(site.owner), with :ok <- Plausible.Billing.Feature.Funnels.check_availability(site.owner),
:ok <- validate_params(site, params),
query <- Query.from(site, params), query <- Query.from(site, params),
:ok <- validate_funnel_query(query), :ok <- validate_funnel_query(query),
{funnel_id, ""} <- Integer.parse(funnel_id), {funnel_id, ""} <- Integer.parse(funnel_id),
@ -770,13 +743,6 @@ defmodule PlausibleWeb.Api.StatsController do
pagination = parse_pagination(params) pagination = parse_pagination(params)
metrics = breakdown_metrics(query, [:visits, :visit_duration]) metrics = breakdown_metrics(query, [:visits, :visit_duration])
query =
if query.filters["event:hostname"] do
Query.put_filter(query, "visit:entry_page_hostname", query.filters["event:hostname"])
else
query
end
entry_pages = entry_pages =
Stats.breakdown(site, query, "visit:entry_page", metrics, pagination) Stats.breakdown(site, query, "visit:entry_page", metrics, pagination)
|> transform_keys(%{entry_page: :name}) |> transform_keys(%{entry_page: :name})
@ -807,13 +773,6 @@ defmodule PlausibleWeb.Api.StatsController do
{limit, page} = parse_pagination(params) {limit, page} = parse_pagination(params)
metrics = breakdown_metrics(query, [:visits]) metrics = breakdown_metrics(query, [:visits])
query =
if query.filters["event:hostname"] do
Query.put_filter(query, "visit:exit_page_hostname", query.filters["event:hostname"])
else
query
end
exit_pages = exit_pages =
Stats.breakdown(site, query, "visit:exit_page", metrics, {limit, page}) Stats.breakdown(site, query, "visit:exit_page", metrics, {limit, page})
|> add_exit_rate(site, query, limit) |> add_exit_rate(site, query, limit)
@ -1292,14 +1251,20 @@ defmodule PlausibleWeb.Api.StatsController do
end end
end end
defp date_validation_plug(conn, _opts) do defp validate_common_input(conn, _opts) do
case parse_date_params(conn.params) do case validate_params(conn.assigns[:site], conn.params) do
{:ok, _dates} -> conn :ok -> conn
{:error, message} when is_binary(message) -> bad_request(conn, message) {:error, message} when is_binary(message) -> bad_request(conn, message)
end end
end end
defp parse_date_params(params) do defp validate_params(site, params) do
with {:ok, dates} <- validate_dates(params),
:ok <- validate_interval(params),
do: validate_interval_granularity(site, params, dates)
end
defp validate_dates(params) do
params params
|> Map.take(["from", "to", "date"]) |> Map.take(["from", "to", "date"])
|> Enum.reduce_while({:ok, %{}}, fn {key, value}, {:ok, acc} -> |> Enum.reduce_while({:ok, %{}}, fn {key, value}, {:ok, acc} ->
@ -1356,23 +1321,6 @@ defmodule PlausibleWeb.Api.StatsController do
end end
end end
defp parse_and_validate_graph_metric(params, query) do
metric =
case params["metric"] do
nil -> :visitors
"conversions" -> :visitors
m -> Plausible.Stats.Metrics.from_string!(m)
end
requires_goal_filter? = metric in [:conversion_rate, :events]
if requires_goal_filter? and !query.filters["event:goal"] do
{:error, "Metric `#{metric}` can only be queried with a goal filter"}
else
{:ok, metric}
end
end
defp bad_request(conn, message, extra \\ %{}) do defp bad_request(conn, message, extra \\ %{}) do
payload = Map.merge(extra, %{error: message}) payload = Map.merge(extra, %{error: message})

@ -750,13 +750,16 @@ defmodule PlausibleWeb.AuthController do
def google_auth_callback(conn, %{"code" => code, "state" => state}) do def google_auth_callback(conn, %{"code" => code, "state" => state}) do
res = Plausible.Google.API.fetch_access_token!(code) res = Plausible.Google.API.fetch_access_token!(code)
[site_id, redirect_to, legacy] = [site_id, redirect_to, legacy, ga4] =
case Jason.decode!(state) do case Jason.decode!(state) do
[site_id, redirect_to] -> [site_id, redirect_to] ->
[site_id, redirect_to, true] [site_id, redirect_to, true, false]
[site_id, redirect_to, legacy] -> [site_id, redirect_to, legacy] ->
[site_id, redirect_to, legacy] [site_id, redirect_to, legacy, false]
[site_id, redirect_to, legacy, ga4] ->
[site_id, redirect_to, legacy, ga4]
end end
site = Repo.get(Plausible.Site, site_id) site = Repo.get(Plausible.Site, site_id)
@ -764,15 +767,26 @@ defmodule PlausibleWeb.AuthController do
case redirect_to do case redirect_to do
"import" -> "import" ->
redirect(conn, if ga4 do
external: redirect(conn,
Routes.google_analytics_path(conn, :property_or_view_form, site.domain, external:
access_token: res["access_token"], Routes.google_analytics4_path(conn, :property_form, site.domain,
refresh_token: res["refresh_token"], access_token: res["access_token"],
expires_at: NaiveDateTime.to_iso8601(expires_at), refresh_token: res["refresh_token"],
legacy: legacy expires_at: NaiveDateTime.to_iso8601(expires_at)
) )
) )
else
redirect(conn,
external:
Routes.universal_analytics_path(conn, :view_id_form, site.domain,
access_token: res["access_token"],
refresh_token: res["refresh_token"],
expires_at: NaiveDateTime.to_iso8601(expires_at),
legacy: legacy
)
)
end
_ -> _ ->
id_token = res["id_token"] id_token = res["id_token"]

@ -0,0 +1,143 @@
defmodule PlausibleWeb.GoogleAnalytics4Controller do
use PlausibleWeb, :controller
plug(PlausibleWeb.RequireAccountPlug)
plug(PlausibleWeb.AuthorizeSiteAccess, [:owner, :admin, :super_admin])
def property_form(conn, %{
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at
}) do
redirect_route = Routes.site_path(conn, :settings_imports_exports, conn.assigns.site.domain)
case Plausible.Google.GA4.API.list_properties(access_token) do
{:ok, properties} ->
conn
|> assign(:skip_plausible_tracking, true)
|> render("property_form.html",
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
site: conn.assigns.site,
properties: properties,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
{:error, :authentication_failed} ->
conn
|> put_flash(
:error,
"We were unable to authenticate your Google Analytics account. Please check that you have granted us permission to 'See and download your Google Analytics data' and try again."
)
|> redirect(external: redirect_route)
{:error, _any} ->
conn
|> put_flash(
:error,
"We were unable to list your Google Analytics properties. If the problem persists, please contact support for assistance."
)
|> redirect(external: redirect_route)
end
end
def property(conn, %{
"property" => property,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at
}) do
site = conn.assigns.site
start_date = Plausible.Google.GA4.API.get_analytics_start_date(access_token, property)
case start_date do
{:ok, nil} ->
{:ok, properties} = Plausible.Google.GA4.API.list_properties(access_token)
conn
|> assign(:skip_plausible_tracking, true)
|> render("property_form.html",
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
site: site,
properties: properties,
selected_property_error: "No data found. Nothing to import",
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
{:ok, _date} ->
redirect(conn,
to:
Routes.google_analytics4_path(conn, :confirm, site.domain,
property: property,
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at
)
)
end
end
def confirm(conn, %{
"property" => property,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at
}) do
site = conn.assigns.site
start_date = Plausible.Google.GA4.API.get_analytics_start_date(access_token, property)
end_date = Plausible.Sites.native_stats_start_date(site) || Timex.today(site.timezone)
{:ok, {property_name, property}} =
Plausible.Google.GA4.API.get_property(access_token, property)
conn
|> assign(:skip_plausible_tracking, true)
|> render("confirm.html",
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
site: site,
selected_property: property,
selected_property_name: property_name,
start_date: start_date,
end_date: end_date,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
def import(conn, %{
"property" => property,
"start_date" => start_date,
"end_date" => end_date,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at
}) do
site = conn.assigns.site
current_user = conn.assigns.current_user
redirect_route = Routes.site_path(conn, :settings_imports_exports, site.domain)
{:ok, _} =
Plausible.Imported.GoogleAnalytics4.new_import(
site,
current_user,
property: property,
start_date: start_date,
end_date: end_date,
access_token: access_token,
refresh_token: refresh_token,
token_expires_at: expires_at
)
conn
|> put_flash(:success, "Import scheduled. An email will be sent when it completes.")
|> redirect(external: redirect_route)
end
end

@ -1,336 +0,0 @@
defmodule PlausibleWeb.GoogleAnalyticsController do
use PlausibleWeb, :controller
alias Plausible.Google
alias Plausible.Imported
require Plausible.Imported.SiteImport
plug(PlausibleWeb.RequireAccountPlug)
plug(PlausibleWeb.AuthorizeSiteAccess, [:owner, :admin, :super_admin])
def user_metric_notice(conn, %{
"property_or_view" => property_or_view,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at,
"start_date" => start_date,
"end_date" => end_date,
"legacy" => legacy
}) do
site = conn.assigns.site
conn
|> assign(:skip_plausible_tracking, true)
|> render("user_metric_form.html",
site: site,
property_or_view: property_or_view,
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
start_date: start_date,
end_date: end_date,
legacy: legacy,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
def property_or_view_form(
conn,
%{
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at,
"legacy" => legacy
} = params
) do
site = conn.assigns.site
redirect_route =
if legacy == "true" do
Routes.site_path(conn, :settings_integrations, site.domain)
else
Routes.site_path(conn, :settings_imports_exports, site.domain)
end
result =
if legacy == "true" do
Google.UA.API.list_views(access_token)
else
Google.API.list_properties_and_views(access_token)
end
error =
case params["error"] do
"no_data" ->
"No data found. Nothing to import."
"no_time_window" ->
"Imported data time range is completely overlapping with existing data. Nothing to import."
_ ->
nil
end
case result do
{:ok, properties_and_views} ->
conn
|> assign(:skip_plausible_tracking, true)
|> render("property_or_view_form.html",
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
site: conn.assigns.site,
properties_and_views: properties_and_views,
selected_property_or_view_error: error,
legacy: legacy,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
{:error, :authentication_failed} ->
conn
|> put_flash(
:error,
"We were unable to authenticate your Google Analytics account. Please check that you have granted us permission to 'See and download your Google Analytics data' and try again."
)
|> redirect(external: redirect_route)
{:error, :timeout} ->
conn
|> put_flash(
:error,
"Google Analytics API has timed out. Please try again."
)
|> redirect(external: redirect_route)
{:error, _any} ->
conn
|> put_flash(
:error,
"We were unable to list your Google Analytics properties and views. If the problem persists, please contact support for assistance."
)
|> redirect(external: redirect_route)
end
end
# see https://stackoverflow.com/a/57416769
@universal_analytics_new_user_metric_date ~D[2016-08-24]
def property_or_view(
conn,
%{
"property_or_view" => property_or_view,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at,
"legacy" => legacy
} = params
) do
site = conn.assigns.site
redirect_route =
if legacy == "true" do
Routes.site_path(conn, :settings_integrations, site.domain)
else
Routes.site_path(conn, :settings_imports_exports, site.domain)
end
with {:ok, api_start_date} <-
Google.API.get_analytics_start_date(access_token, property_or_view),
{:ok, api_end_date} <- Google.API.get_analytics_end_date(access_token, property_or_view),
{:ok, start_date, end_date} <- Imported.check_dates(site, api_start_date, api_end_date) do
action =
if Timex.before?(api_start_date, @universal_analytics_new_user_metric_date) do
:user_metric_notice
else
:confirm
end
redirect(conn,
external:
Routes.google_analytics_path(conn, action, site.domain,
property_or_view: property_or_view,
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
start_date: Date.to_iso8601(start_date),
end_date: Date.to_iso8601(end_date),
legacy: legacy
)
)
else
{:error, error} when error in [:no_data, :no_time_window] ->
params =
params
|> Map.take(["access_token", "refresh_token", "expires_at", "legacy"])
|> Map.put("error", Atom.to_string(error))
property_or_view_form(conn, params)
{:error, :authentication_failed} ->
conn
|> put_flash(
:error,
"Google Analytics authentication seems to have expired. Please try again."
)
|> redirect(external: redirect_route)
{:error, :timeout} ->
conn
|> put_flash(
:error,
"Google Analytics API has timed out. Please try again."
)
|> redirect(external: redirect_route)
{:error, _any} ->
conn
|> put_flash(
:error,
"We were unable to retrieve information from Google Analytics. If the problem persists, please contact support for assistance."
)
|> redirect(external: redirect_route)
end
end
def confirm(conn, %{
"property_or_view" => property_or_view,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at,
"start_date" => start_date,
"end_date" => end_date,
"legacy" => legacy
}) do
site = conn.assigns.site
start_date = Date.from_iso8601!(start_date)
end_date = Date.from_iso8601!(end_date)
redirect_route =
if legacy == "true" do
Routes.site_path(conn, :settings_integrations, site.domain)
else
Routes.site_path(conn, :settings_imports_exports, site.domain)
end
case Google.API.get_property_or_view(access_token, property_or_view) do
{:ok, %{name: property_or_view_name, id: property_or_view}} ->
conn
|> assign(:skip_plausible_tracking, true)
|> render("confirm.html",
access_token: access_token,
refresh_token: refresh_token,
expires_at: expires_at,
site: site,
selected_property_or_view: property_or_view,
selected_property_or_view_name: property_or_view_name,
start_date: start_date,
end_date: end_date,
property?: Google.API.property?(property_or_view),
legacy: legacy,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
{:error, :authentication_failed} ->
conn
|> put_flash(
:error,
"Google Analytics authentication seems to have expired. Please try again."
)
|> redirect(external: redirect_route)
{:error, :timeout} ->
conn
|> put_flash(
:error,
"Google Analytics API has timed out. Please try again."
)
|> redirect(external: redirect_route)
{:error, :not_found} ->
conn
|> put_flash(
:error,
"Google Analytics property not found. Please try again."
)
|> redirect(external: redirect_route)
{:error, _any} ->
conn
|> put_flash(
:error,
"We were unable to retrieve information from Google Analytics. If the problem persists, please contact support for assistance."
)
|> redirect(external: redirect_route)
end
end
def import(conn, %{
"property_or_view" => property_or_view,
"start_date" => start_date,
"end_date" => end_date,
"access_token" => access_token,
"refresh_token" => refresh_token,
"expires_at" => expires_at,
"legacy" => legacy
}) do
site = conn.assigns.site
current_user = conn.assigns.current_user
start_date = Date.from_iso8601!(start_date)
end_date = Date.from_iso8601!(end_date)
redirect_route =
if legacy == "true" do
Routes.site_path(conn, :settings_integrations, site.domain)
else
Routes.site_path(conn, :settings_imports_exports, site.domain)
end
import_opts = [
label: property_or_view,
start_date: start_date,
end_date: end_date,
access_token: access_token,
refresh_token: refresh_token,
token_expires_at: expires_at,
legacy: legacy == "true"
]
with {:ok, start_date, end_date} <- Imported.check_dates(site, start_date, end_date),
import_opts = [{:start_date, start_date}, {:end_date, end_date} | import_opts],
{:ok, _} <- schedule_job(site, current_user, property_or_view, import_opts) do
conn
|> put_flash(:success, "Import scheduled. An email will be sent when it completes.")
|> redirect(external: redirect_route)
else
{:error, :no_time_window} ->
conn
|> put_flash(
:error,
"Import failed. No data could be imported because date range overlaps with existing data."
)
|> redirect(external: redirect_route)
{:error, :import_in_progress} ->
conn
|> put_flash(
:error,
"There's another import still in progress. Please wait until it's completed or cancel it before starting a new one."
)
|> redirect(external: redirect_route)
end
end
defp schedule_job(site, current_user, property_or_view, opts) do
if Google.API.property?(property_or_view) do
opts = Keyword.put(opts, :property, property_or_view)
Imported.GoogleAnalytics4.new_import(site, current_user, opts)
else
opts = Keyword.put(opts, :view_id, property_or_view)
Imported.UniversalAnalytics.new_import(site, current_user, opts)
end
end
end

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save