Skip to content

Commit 0e89a6d

Browse files
authored
feat(rpc): Remove spans specific code (#83714)
- Removes spans specific code from the SearchResolver so that it can be reused by logs
1 parent 593326a commit 0e89a6d

File tree

7 files changed

+659
-544
lines changed

7 files changed

+659
-544
lines changed

src/sentry/api/endpoints/organization_spans_fields.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
from sentry.api.utils import handle_query_errors
2828
from sentry.models.organization import Organization
2929
from sentry.search.eap import constants
30-
from sentry.search.eap.columns import translate_internal_to_public_alias
31-
from sentry.search.eap.spans import SearchResolver
30+
from sentry.search.eap.resolver import SearchResolver
31+
from sentry.search.eap.span_columns import SPAN_DEFINITIONS, translate_internal_to_public_alias
3232
from sentry.search.eap.types import SearchResolverConfig
3333
from sentry.search.events.builder.base import BaseQueryBuilder
3434
from sentry.search.events.builder.spans_indexed import SpansIndexedQueryBuilder
@@ -110,7 +110,9 @@ def get(self, request: Request, organization: Organization) -> Response:
110110
hour=0, minute=0, second=0, microsecond=0
111111
) + timedelta(days=1)
112112

113-
resolver = SearchResolver(params=snuba_params, config=SearchResolverConfig())
113+
resolver = SearchResolver(
114+
params=snuba_params, config=SearchResolverConfig(), definitions=SPAN_DEFINITIONS
115+
)
114116
meta = resolver.resolve_meta(referrer=Referrer.API_SPANS_TAG_KEYS_RPC.value)
115117

116118
rpc_request = TraceItemAttributeNamesRequest(
@@ -406,7 +408,9 @@ def __init__(
406408
max_span_tag_values: int,
407409
):
408410
super().__init__(organization, snuba_params, key, query, max_span_tag_values)
409-
self.resolver = SearchResolver(params=snuba_params, config=SearchResolverConfig())
411+
self.resolver = SearchResolver(
412+
params=snuba_params, config=SearchResolverConfig(), definitions=SPAN_DEFINITIONS
413+
)
410414
self.search_type, self.attribute_key = self.resolve_attribute_key(key, snuba_params)
411415

412416
def resolve_attribute_key(

0 commit comments

Comments
 (0)