Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: fix sql activity app filter on internal queries #114498

Merged
merged 1 commit into from Nov 15, 2023

Conversation

xinhaoz
Copy link
Member

@xinhaoz xinhaoz commented Nov 15, 2023

This commit fixes a bug when using the app filter on the statements sql activity page. Previously when the internal app name prefix, '$ internal' was selected from the dropdown, internal queries would not show up because we were performing an exact match on the application name and selected applications. This patch fixes this by matching on the prefix of the app name with the internal app name prefix when it is selected. In addition, internal queries are now only shown when the internal app name prefix is selected from the app filter dropdown. This reduces noise from internal queries and also matches the behaviour in the transactions page.

Epic: none
Fixes: #114461

https://www.loom.com/share/8fd77d2448ea4793a3ab225a46faa85e

This commit fixes a bug when using the app filter on the statements
sql activity page. Previously when the internal app name prefix,
'$ internal' was selected from the dropdown, internal queries would
not show up because we were performing an exact match on the application
name and selected applications. This patch fixes this by matching on
the prefix of the app name with the internal app name prefix when
it is selected. In addition, internal queries are now only shown when
the internal app name prefix is selected from the app filter dropdown.
This reduces noise from internal queries and also matches the behaviour
in the transactions page.

Epic: none
Fixes: cockroachdb#114461
@xinhaoz xinhaoz requested a review from a team as a code owner November 15, 2023 15:12
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@xinhaoz xinhaoz requested review from a team, abarganier and maryliag and removed request for a team November 15, 2023 15:16
Copy link
Contributor

@maryliag maryliag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

can you also add a backport to 23.2 and 23.1

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @abarganier)

@xinhaoz xinhaoz added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. labels Nov 15, 2023
@xinhaoz
Copy link
Member Author

xinhaoz commented Nov 15, 2023

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 15, 2023

Build succeeded:

@craig craig bot merged commit bab4335 into cockroachdb:master Nov 15, 2023
8 checks passed
Copy link

blathers-crl bot commented Nov 15, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 8802beb to blathers/backport-release-23.1-114498: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@maryliag maryliag added branch-master Failures on the master branch. GA-blocker branch-release-23.2 Used to mark GA and release blockers and technical advisories for 23.2 labels Nov 15, 2023
@xinhaoz xinhaoz deleted the fix-internal-app-filter branch April 1, 2024 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. branch-master Failures on the master branch. branch-release-23.2 Used to mark GA and release blockers and technical advisories for 23.2 GA-blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ui: filtering by $ internal app name is broken
3 participants