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

ref(eap): cleanup from custom formulas #86330

Merged
merged 9 commits into from
Mar 5, 2025

Conversation

DominikB2014
Copy link
Contributor

Part 1 of a few cleanups from #85662

The term aggregate and function were used quite interchangeably. This was fine before, but now that we support custom functions, this terminology get's a bit confusing. This PR does a bunch of cleanup to resolved this.

  1. A Function should be used as a non-attribute column, this means an Aggregate, ConditionalAggregate or Formula is a type of function. Functions may or may not take parameters. This also better matches what the protobuf defines as a Column, https://github.com/getsentry/sentry-protos/blob/671d2784e499b9306baf3dd86cff382bda724b3d/proto/sentry_protos/snuba/v1/endpoint_trace_item_table.proto#L81-L83
  2. FunctionDefinition and ResolvedFunction were renamed to Aggregate Definition and ResolvedAggregate
  3. A base FunctionDefinition and FunctionDefinition were created
  4. Methods resolve_aggregate and resolve_aggregates were renamed to resolved_function and resolve_functions

@DominikB2014 DominikB2014 requested a review from a team as a code owner March 4, 2025 20:48
@DominikB2014 DominikB2014 requested a review from wmak March 4, 2025 20:48
@github-actions github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Mar 4, 2025
Copy link
Member

@wmak wmak left a comment

Choose a reason for hiding this comment

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

Thanks for the follow up, lets move some documentation from the PR -> the actual code, otherwise lgtm

Copy link

codecov bot commented Mar 5, 2025

Codecov Report

Attention: Patch coverage is 97.29730% with 1 line in your changes missing coverage. Please review.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
src/sentry/search/eap/resolver.py 90.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           master   #86330       +/-   ##
===========================================
+ Coverage   46.64%   87.90%   +41.26%     
===========================================
  Files        9732     9726        -6     
  Lines      551671   551788      +117     
  Branches    21533    21445       -88     
===========================================
+ Hits       257304   485031   +227727     
+ Misses     293978    66371   -227607     
+ Partials      389      386        -3     

@DominikB2014 DominikB2014 merged commit d5936e2 into master Mar 5, 2025
49 checks passed
@DominikB2014 DominikB2014 deleted the DominikB2014/refator-eap-columns branch March 5, 2025 16:59
philipphofmann pushed a commit that referenced this pull request Mar 6, 2025
Part 1 of a few cleanups from #85662 

The term `aggregate` and `function` were used quite interchangeably.
This was fine before, but now that we support custom functions, this
terminology get's a bit confusing. This PR does a bunch of cleanup to
resolved this.

1. A `Function` should be used as a `non-attribute` column, this means
an `Aggregate`, `ConditionalAggregate` or `Formula` is a type of
function. Functions may or may not take parameters. This also better
matches what the protobuf defines as a `Column`,
https://github.com/getsentry/sentry-protos/blob/671d2784e499b9306baf3dd86cff382bda724b3d/proto/sentry_protos/snuba/v1/endpoint_trace_item_table.proto#L81-L83
2. `FunctionDefinition` and `ResolvedFunction` were renamed to
`Aggregate Definition` and `ResolvedAggregate`
3. A base `FunctionDefinition` and `FunctionDefinition` were created
4. Methods `resolve_aggregate` and `resolve_aggregates` were renamed to
`resolved_function` and `resolve_functions`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Scope: Backend Automatically applied to PRs that change backend components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants