Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Support comparing against previous period for performance view

Blue Mouseb3bb73c91ab3
diff --git a/web/app/api/api.server.ts b/web/app/api/api.server.ts
index 7c5623adf..960e6d870 100644
--- a/web/app/api/api.server.ts
+++ b/web/app/api/api.server.ts
@@ -857,14 +857,17 @@ export interface PerformanceDataResponse {
params: Record<string, { name: string; count: number }[]>
chart: {
x: string[]
- dns: number[]
- tls: number[]
- conn: number[]
- response: number[]
- render: number[]
- domLoad: number[]
- pageLoad: number[]
- ttfb: number[]
+ dns?: number[]
+ tls?: number[]
+ conn?: number[]
+ response?: number[]
+ render?: number[]
+ domLoad?: number[]
+ pageLoad?: number[]
+ ttfb?: number[]
+ p50?: number[]
+ p75?: number[]
+ p95?: number[]
}
appliedFilters: AnalyticsFilter[]
timeBucket?: string[]
diff --git a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
index 3f162948c..8bfa29e12 100644
--- a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
+++ b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
@@ -74,6 +74,8 @@ interface PerformanceViewProps {
interface DeferredPerfData {
perfData: PerformanceDataResponse | null
perfOverallStats: Record<string, PerformanceOverallObject> | null
+ perfCompareData: PerformanceDataResponse | null
+ perfOverallCompareStats: Record<string, PerformanceOverallObject> | null
}
function PerfDataResolver({
@@ -84,14 +86,31 @@ function PerfDataResolver({
const {
perfData: perfDataPromise,
perfOverallStats: perfOverallStatsPromise,
+ perfCompareData: perfCompareDataPromise,
+ perfOverallCompareStats: perfOverallCompareStatsPromise,
} = useLoaderData<ProjectLoaderData>()
const perfData = perfDataPromise ? use(perfDataPromise) : null
const perfOverallStats = perfOverallStatsPromise
? use(perfOverallStatsPromise)
: null
+ const perfCompareData = perfCompareDataPromise
+ ? use(perfCompareDataPromise)
+ : null
+ const perfOverallCompareStats = perfOverallCompareStatsPromise
+ ? use(perfOverallCompareStatsPromise)
+ : null
- return <>{children({ perfData, perfOverallStats })}</>
+ return (
+ <>
+ {children({
+ perfData,
+ perfOverallStats,
+ perfCompareData,
+ perfOverallCompareStats,
+ })}
+ </>
+ )
}
function PerformanceViewWrapper(props: PerformanceViewProps) {
@@ -121,8 +140,6 @@ const PerformanceViewInner = ({
filters,
timeFormat,
timeBucket,
- // Comparison state from context (not implemented via SSR yet)
- activePeriodCompare,
// Chart state from context
chartType,
setChartTypeOnClick,
@@ -235,9 +252,17 @@ const PerformanceViewInner = ({
setSearchParams(newParams)
}
- // Compare mode not implemented via SSR yet - use empty defaults
- const overallCompare: Partial<OverallPerformanceObject> = {}
- const chartDataCompare: any = {}
+ const overallCompare: Partial<OverallPerformanceObject> = useMemo(() => {
+ if (deferredData.perfOverallCompareStats && id) {
+ return deferredData.perfOverallCompareStats[id] || {}
+ }
+ return {}
+ }, [deferredData.perfOverallCompareStats, id])
+
+ const chartDataCompare: any = useMemo(
+ () => deferredData.perfCompareData?.chart || {},
+ [deferredData.perfCompareData],
+ )
// Filter annotations to only those within the chart's visible x-axis range
const filteredAnnotations = useMemo(() => {
@@ -496,7 +521,6 @@ const PerformanceViewInner = ({
<PerformanceMetricCards
overall={overall}
overallCompare={overallCompare}
- activePeriodCompare={activePeriodCompare}
/>
) : null}
{activeChartMetrics && !_isEmpty(chartData) ? (
diff --git a/web/app/pages/Project/tabs/Traffic/MetricCards.tsx b/web/app/pages/Project/tabs/Traffic/MetricCards.tsx
index 5cb63fe99..3d0238e6f 100644
--- a/web/app/pages/Project/tabs/Traffic/MetricCards.tsx
+++ b/web/app/pages/Project/tabs/Traffic/MetricCards.tsx
@@ -228,22 +228,17 @@ export const MetricCards = memo(
interface PerformanceMetricCardsProps {
overall: Partial<OverallPerformanceObject>
overallCompare?: Partial<OverallPerformanceObject>
- activePeriodCompare?: string
}
export const PerformanceMetricCards = memo(
- ({
- overall,
- overallCompare,
- activePeriodCompare,
- }: PerformanceMetricCardsProps) => {
+ ({ overall, overallCompare }: PerformanceMetricCardsProps) => {
const { t } = useTranslation('common')
let frontendChange = overall.frontendChange
let backendChange = overall.backendChange
let networkChange = overall.networkChange
- if (!_isEmpty(overallCompare) && activePeriodCompare !== 'previous') {
+ if (!_isEmpty(overallCompare)) {
frontendChange =
(overall.current?.frontend ?? 0) -
(overallCompare?.current?.frontend ?? 0)
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index c777d194e..4fbd0457e 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -303,6 +303,11 @@ export interface ProjectLoaderData {
// Performance data
perfData?: Promise<PerformanceDataResponse | null>
perfOverallStats?: Promise<Record<string, PerformanceOverallObject> | null>
+ perfCompareData?: Promise<PerformanceDataResponse | null>
+ perfOverallCompareStats?: Promise<Record<
+ string,
+ PerformanceOverallObject
+ > | null>
// Sessions data
sessionsData?: Promise<SessionsResponse | null>
sessionDetails?: Promise<SessionDetailsResponse | null>
@@ -384,7 +389,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
const measure = url.searchParams.get('measure') || 'median'
const perfMetric = url.searchParams.get('perfMetric') || 'timing' // 'timing' or 'quantiles'
- // Traffic compare params
+ // Compare params
const compareEnabled = url.searchParams.get('compare') === 'true'
const compareFrom = formatDateForBackend(
url.searchParams.get('compareFrom') || '',
@@ -427,6 +432,10 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
let perfOverallStats:
| Promise<Record<string, PerformanceOverallObject> | null>
| undefined
+ let perfCompareData: Promise<PerformanceDataResponse | null> | undefined
+ let perfOverallCompareStats:
+ | Promise<Record<string, PerformanceOverallObject> | null>
+ | undefined
let sessionsData: Promise<SessionsResponse | null> | undefined
let sessionDetails: Promise<SessionDetailsResponse | null> | undefined
let errorsData: Promise<ErrorsResponse | null> | undefined
@@ -499,6 +508,25 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
[projectId],
perfParams,
).then((res) => res.data)
+
+ if (compareEnabled && compareFrom && compareTo) {
+ const compareParams = {
+ ...perfParams,
+ period: 'custom' as const,
+ from: compareFrom,
+ to: compareTo,
+ }
+ perfCompareData = getPerfDataServer(
+ request,
+ projectId,
+ compareParams,
+ ).then((res) => res.data)
+ perfOverallCompareStats = getPerformanceOverallStatsServer(
+ request,
+ [projectId],
+ compareParams,
+ ).then((res) => res.data)
+ }
} else if (tab === PROJECT_TABS.sessions) {
sessionsData = getSessionsServer(
request,
@@ -588,6 +616,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
customEventsData,
perfData,
perfOverallStats,
+ perfCompareData,
+ perfOverallCompareStats,
sessionsData,
sessionDetails,
errorsData,