Edit GA4 Auto Metric Query & Add Audit Logging to Auto Metrics #1682
Conversation
…reating auto metrics.
|
Your preview environment pr-1682-bttf has been deployed. Preview environment endpoints are available at: |
…to the job to add to the audit log.
… still kick off the job to create auto metrics. This will be removed soon.
mknowlton89
changed the title
| return; | ||
| } | ||
|
|
||
| const userObj: Omit< |
There was a problem hiding this comment.
We've discussed removing the ability for a user to add auto metrics from within the NewDataSourceForm - once we do that, we can remove this logic.
| @@ -1508,7 +1508,7 @@ export default abstract class SqlIntegration | |||
| )}' AND'${formatDate(end, "yyyyMMdd")}'`, | |||
| getAdditionalEvents: () => [], | |||
| getMetricWhereClause: (eventName: string) => | |||
| `WHERE event_name = '${eventName}'`, | |||
| `WHERE _TABLE_SUFFIX BETWEEN '{{date startDateISO "yyyyMMdd"}}' AND '{{date endDateISO "yyyyMMdd"}}' AND event_name = '${eventName}'`, | |||
There was a problem hiding this comment.
I have updated this in: #1673 to get the intraday tables as well. So if I land that first then you will have a merge conflict. Or you can copy the code from that change.
| @@ -1508,7 +1508,7 @@ export default abstract class SqlIntegration | |||
| )}' AND'${formatDate(end, "yyyyMMdd")}'`, | |||
| getAdditionalEvents: () => [], | |||
| getMetricWhereClause: (eventName: string) => | |||
| `WHERE event_name = '${eventName}'`, | |||
| `WHERE _TABLE_SUFFIX BETWEEN '{{date startDateISO "yyyyMMdd"}}' AND '{{date endDateISO "yyyyMMdd"}}' AND event_name = '${eventName}'`, | |||
| }; | |||
| } | |||
| case "rudderstack": | |||
There was a problem hiding this comment.
This is not relevant to this PR, but I'm curious as to why we use the switch statement instead of functions on the individual implementations, ie. in GoogleAnalytics.ts
| @@ -23,6 +27,10 @@ type CreateAutoGeneratedMetricsJob = Job<{ | |||
| | "dateCreated" | |||
| | "dateUpdated" | |||
| >[]; | |||
| user: Omit< | |||
There was a problem hiding this comment.
Looks like you missed this one still.
This PR makes two changes to the auto generate metrics job.
It updates the default metric query for GA4 data sources to include an additional where clause using the
_TABLE_SUFFIXcolumn.It adds audit logging for when an auto metric is created. This looks to be a net-new pattern. Currently, it looks as those most of our audit logging happens directly within controllers. However, we don't create the auto metrics in the controller, but instead kick off an async job. As a result, we can't call
req.auditin the controller, as we don't have necessary info, likemetric.idas that has not yet been generated.As such, we're now having to get the user info and pass that into the job as well. Open to suggestions if there is a way we can abstract the logic so it's less verbose.
Testing
auditscollection in Mongo.