Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

[fix] fixes for mau calculations in product analytics#52581

Merged
kopancek merged 3 commits into
mainfrom
milan/filter_out_backend_events
May 30, 2023
Merged

[fix] fixes for mau calculations in product analytics#52581
kopancek merged 3 commits into
mainfrom
milan/filter_out_backend_events

Conversation

@kopancek

@kopancek kopancek commented May 30, 2023

Copy link
Copy Markdown
Contributor

Fixes MAU calculation in usage analytics in the product.

Previously we were filtering out the backend events, but as part of #52306 this was removed, because I believed it shold not be there, as it was not part of the BuildCommonUsageConds in the event_logs. However event_logs also add this condition directly in the query string, which I did not notice.

Also, our timestamp calculation suffered from an edge case, where the from time was not calculated right, e.g. on dates like 2023-04-30T23:59:00Z.

Test plan

Tested locally and with customer data + added unit tests.

This is for usage analytics in the product. Previously we were filtering
out the backend events, but as part of #52306 this was removed, because
I believed it shold not be there, as it was not part of the BuildCommonUsageConds
in the event_logs. However event_logs also add this condition directly
in the query string, which I did not notice.
@kopancek kopancek requested review from a team, dadlerj and nathan-downs May 30, 2023 08:39
@kopancek kopancek self-assigned this May 30, 2023
@cla-bot cla-bot Bot added the cla-signed label May 30, 2023
This was wrong when current time was 2023-04-30T23:59:00Z, because the
resulting from timestamp was calculated as 2023-03-01T00:00:00Z whereas
user (and me) would expect 2023-02-01T00:00:00Z. Fixed by first truncating
the current date and then subtracting the months.

Extracted into it's own funciton for easier unit tests.
@kopancek kopancek changed the title [fix] add back the condition to filter out backend events [fix] fixes for mau calculations in product analytics May 30, 2023
@kopancek kopancek merged commit ee6e66e into main May 30, 2023
@kopancek kopancek deleted the milan/filter_out_backend_events branch May 30, 2023 11:59
@github-actions

Copy link
Copy Markdown
Contributor

The backport to 5.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.0 5.0
# Navigate to the new working tree
cd .worktrees/backport-5.0
# Create a new branch
git switch --create backport-52581-to-5.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee6e66ee50eb1e0ffffcdfc80d170d8160283cf5
# Push it to GitHub
git push --set-upstream origin backport-52581-to-5.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.0

Then, create a pull request where the base branch is 5.0 and the compare/head branch is backport-52581-to-5.0.

@github-actions github-actions Bot added backports failed-backport-to-5.0 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels May 30, 2023
@github-actions

Copy link
Copy Markdown
Contributor

The backport to 5.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.0 5.0
# Navigate to the new working tree
cd .worktrees/backport-5.0
# Create a new branch
git switch --create backport-52581-to-5.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee6e66ee50eb1e0ffffcdfc80d170d8160283cf5
# Push it to GitHub
git push --set-upstream origin backport-52581-to-5.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.0

Then, create a pull request where the base branch is 5.0 and the compare/head branch is backport-52581-to-5.0.

kopancek added a commit that referenced this pull request May 31, 2023
Fixes MAU calculation in usage analytics in the product.

Previously we were filtering out the backend events, but as part of
was not part of the BuildCommonUsageConds in the event_logs. However
event_logs also add this condition directly in the query string, which I
did not notice.

Also, our timestamp calculation suffered from an edge case, where the
from time was not calculated right, e.g. on dates like
`2023-04-30T23:59:00Z`.

Tested locally and with customer data + added unit tests.

(cherry picked from commit ee6e66e)
keegancsmith pushed a commit that referenced this pull request May 31, 2023
ErikaRS pushed a commit that referenced this pull request Jun 22, 2023
Fixes MAU calculation in usage analytics in the product. 

Previously we were filtering out the backend events, but as part of
#52306 this was removed, because I believed it shold not be there, as it
was not part of the BuildCommonUsageConds in the event_logs. However
event_logs also add this condition directly in the query string, which I
did not notice.

Also, our timestamp calculation suffered from an edge case, where the
from time was not calculated right, e.g. on dates like
`2023-04-30T23:59:00Z`.

## Test plan

Tested locally and with customer data + added unit tests.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backports cla-signed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants