Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Removed custom date format. Use ISO string everywhere.
Mike Cao04de69189365
diff --git a/package.json b/package.jsonindex dd43d8890..d6217788d 100644--- a/package.json+++ b/package.json@@ -84,7 +84,6 @@"cross-spawn": "^7.0.3","date-fns": "^2.23.0","date-fns-tz": "^1.1.4",- "dateformat": "^5.0.3","debug": "^4.3.4","del": "^6.0.0","detect-browser": "^5.2.0",diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.tsindex bf3da950f..78f0323ed 100644--- a/src/lib/clickhouse.ts+++ b/src/lib/clickhouse.ts@@ -1,5 +1,4 @@import { ClickHouseClient, createClient } from '@clickhouse/client';-import dateFormat from 'dateformat';import debug from 'debug';import { CLICKHOUSE } from 'lib/db';import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';@@ -63,10 +62,6 @@ function getDateSQL(field: string, unit: string, timezone?: string) {return `date_trunc('${unit}', ${field})`;}-function getDateFormat(date: Date) {- return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;-}-function mapFilter(column: string, operator: string, name: string, type: string = 'String') {const value = `{${name}:${type}}`;@@ -224,7 +219,6 @@ export default {connect,getDateStringSQL,getDateSQL,- getDateFormat,getFilterQuery,parseFilters,pagedQuery,diff --git a/src/lib/kafka.ts b/src/lib/kafka.tsindex 76692afb4..38a7073e6 100644--- a/src/lib/kafka.ts+++ b/src/lib/kafka.ts@@ -1,4 +1,3 @@-import dateFormat from 'dateformat';import debug from 'debug';import { Kafka, Mechanism, Producer, RecordMetadata, SASLOptions, logLevel } from 'kafkajs';import { KAFKA, KAFKA_PRODUCER } from 'lib/db';@@ -56,10 +55,6 @@ async function getProducer(): Promise<Producer> {return producer;}-function getDateFormat(date: Date, format?: string): string {- return dateFormat(date, format ? format : 'UTC:yyyy-mm-dd HH:MM:ss');-}-async function sendMessage(topic: string,message: { [key: string]: string | number },@@ -107,7 +102,6 @@ export default {producer,log,connect,- getDateFormat,sendMessage,sendMessages,};diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.tsindex fa4805df3..5e21e303f 100644--- a/src/queries/analytics/events/saveEvent.ts+++ b/src/queries/analytics/events/saveEvent.ts@@ -136,9 +136,9 @@ async function clickhouseQuery(data: {...args} = data;const { insert } = clickhouse;- const { getDateFormat, sendMessage } = kafka;+ const { sendMessage } = kafka;const eventId = uuid();- const createdAt = getDateFormat(new Date());+ const createdAt = new Date().toISOString();const message = {...args,diff --git a/src/queries/analytics/events/saveEventData.ts b/src/queries/analytics/events/saveEventData.tsindex 9c7218e97..fec4cae39 100644--- a/src/queries/analytics/events/saveEventData.ts+++ b/src/queries/analytics/events/saveEventData.ts@@ -61,7 +61,7 @@ async function clickhouseQuery(data: {const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;const { insert } = clickhouse;- const { getDateFormat, sendMessages } = kafka;+ const { sendMessages } = kafka;const jsonKeys = flattenJSON(eventData);@@ -76,7 +76,7 @@ async function clickhouseQuery(data: {data_type: dataType,string_value: getStringValue(value, dataType),number_value: dataType === DATA_TYPE.number ? value : null,- date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null,+ date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,created_at: createdAt,};});diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.tsindex 51f5c47d0..d932f7ed2 100644--- a/src/queries/analytics/sessions/saveSessionData.ts+++ b/src/queries/analytics/sessions/saveSessionData.ts@@ -81,8 +81,8 @@ async function clickhouseQuery(data: {const { websiteId, sessionId, sessionData } = data;const { insert } = clickhouse;- const { getDateFormat, sendMessages } = kafka;- const createdAt = getDateFormat(new Date());+ const { sendMessages } = kafka;+ const createdAt = new Date().toISOString();const jsonKeys = flattenJSON(sessionData);@@ -94,7 +94,7 @@ async function clickhouseQuery(data: {data_type: dataType,string_value: getStringValue(value, dataType),number_value: dataType === DATA_TYPE.number ? value : null,- date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null,+ date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,created_at: createdAt,};});diff --git a/yarn.lock b/yarn.lockindex e7456af73..cf78cc0c6 100644--- a/yarn.lock+++ b/yarn.lock@@ -4625,11 +4625,6 @@ date-fns@^2.23.0, date-fns@^2.29.3:dependencies:"@babel/runtime" "^7.21.0"-dateformat@^5.0.3:- version "5.0.3"- resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-5.0.3.tgz#fe2223eff3cc70ce716931cb3038b59a9280696e"- integrity sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==-dayjs@^1.10.4:version "1.11.12"resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"