ref(resolvers): inline the time series resolver - #8453
Open
MeredithAnya wants to merge 1 commit into
Open
Conversation
ResolverTimeSeriesEAPItems was the only implementation of ResolverTimeSeries, so the trace_item_type dispatch could only ever return it. Move the resolver module body into endpoint_time_series.py and turn resolve() into _query_time_series, following 76d1fed. The resolver's snuba AST Expression collides with the endpoint's proto Expression, so _convert_aggregations_to_expressions now uses the resolver's existing ProtoExpression alias. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This was referenced Sep 9, 2026
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
Comment on lines
584
to
+592
| in_msg_wrapper = TimeSeriesRequestWrapper(in_msg) | ||
| in_msg_wrapper.accept(aggregation_to_conditional_aggregation_visitor) | ||
| preprocess_expression_labels(in_msg) | ||
| resolver = self.get_resolver(in_msg.meta.trace_item_type) | ||
| return resolver.resolve(in_msg, self.routing_decision) | ||
| return self._query_time_series(in_msg) | ||
|
|
||
| def _query_time_series(self, in_msg: TimeSeriesRequest) -> TimeSeriesResponse: | ||
| routing_decision = self.routing_decision | ||
|
|
||
| # aggregations field is deprecated, it gets converted to request.expressions |
Contributor
There was a problem hiding this comment.
Bug: The duplicate label check in _enforce_no_duplicate_labels only validates request.aggregations, allowing duplicate labels in request.expressions to be processed.
Severity: MEDIUM
Suggested Fix
Update _enforce_no_duplicate_labels to check for duplicate labels across both request.aggregations and request.expressions. The function should gather all labels from both fields to ensure the combined set is unique before any conversion or further processing occurs.
Prompt for AI Agent
Review the code at the location below. A potential bug has been identified by an AI
agent. Verify if this is a real issue. If it is, propose a fix; if not, explain why it's
not valid.
Location: snuba/web/rpc/v1/endpoint_time_series.py#L584-L592
Potential issue: The function `_enforce_no_duplicate_labels` only checks for duplicate
labels in `request.aggregations`, but not in `request.expressions`. This allows a
request to be processed with duplicate labels if they are sent directly in the
`expressions` field, or if labels in `aggregations` overlap with labels already present
in `expressions`. After `_convert_aggregations_to_expressions` runs, the `expressions`
list will contain these duplicates. This can lead to incorrect query results or
behavior, as downstream code like `_convert_result_timeseries` uses `expr.label` as
dictionary keys, assuming they are unique.
Did we get this right? 👍 / 👎 to inform future reviews.
MeredithAnya
added this pull request to stack #8456
September 9, 2026 23:52
pbhandari
approved these changes
Sep 10, 2026
Comment on lines
+83
to
+88
| OP_TO_EXPR = { | ||
| ProtoExpression.BinaryFormula.OP_ADD: f.plus, | ||
| ProtoExpression.BinaryFormula.OP_SUBTRACT: f.minus, | ||
| ProtoExpression.BinaryFormula.OP_MULTIPLY: f.multiply, | ||
| ProtoExpression.BinaryFormula.OP_DIVIDE: f.divide, | ||
| } |
Contributor
There was a problem hiding this comment.
can we move this elsewhere to a common file?
This is probably something we want to make sure is the same constant used everywhere, and storing it inside an endpoint file discourages that usage and hampers discoverability.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stack
ref(resolvers): remove unused resolver declarationsref(resolvers): inline the trace item stats resolverref(resolvers): inline the time series resolverref(resolvers): inline the trace item table resolverref(resolvers): remove the TraceItemDataResolver abstractionWhat
Same transformation as #8452, applied to
EndpointTimeSeries.ResolverTimeSeriesEAPItemswas the only implementation ofResolverTimeSeries, so thetrace_item_typedispatch could only ever return it.Moves the resolver module body into
endpoint_time_series.py, turnsresolve()into_query_time_seriesreadingself.routing_decision.One thing to look at
The two modules disagreed on the name
Expression: the endpoint imported the proto one fromendpoint_time_series_pb2, the resolver imported the snuba AST one under that name and the proto one asProtoExpression. The merged module keeps the resolver's imports, so_convert_aggregations_to_expressionsnow constructsProtoExpression(...)instead ofExpression(...). Same object, no behavior change.Tests
Import/patch-target updates only.
pytest tests/web/rpc/v1/test_endpoint_time_series/ tests/web/rpc/v1/test_storage_routing.py→ 78 passed, 1 xfailed.mypy snuba/web/rpc/clean.🤖 Generated with Claude Code