|
27 | 27 | from sentry.api.utils import handle_query_errors
|
28 | 28 | from sentry.models.organization import Organization
|
29 | 29 | 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 |
32 | 32 | from sentry.search.eap.types import SearchResolverConfig
|
33 | 33 | from sentry.search.events.builder.base import BaseQueryBuilder
|
34 | 34 | from sentry.search.events.builder.spans_indexed import SpansIndexedQueryBuilder
|
@@ -110,7 +110,9 @@ def get(self, request: Request, organization: Organization) -> Response:
|
110 | 110 | hour=0, minute=0, second=0, microsecond=0
|
111 | 111 | ) + timedelta(days=1)
|
112 | 112 |
|
113 |
| - resolver = SearchResolver(params=snuba_params, config=SearchResolverConfig()) |
| 113 | + resolver = SearchResolver( |
| 114 | + params=snuba_params, config=SearchResolverConfig(), definitions=SPAN_DEFINITIONS |
| 115 | + ) |
114 | 116 | meta = resolver.resolve_meta(referrer=Referrer.API_SPANS_TAG_KEYS_RPC.value)
|
115 | 117 |
|
116 | 118 | rpc_request = TraceItemAttributeNamesRequest(
|
@@ -406,7 +408,9 @@ def __init__(
|
406 | 408 | max_span_tag_values: int,
|
407 | 409 | ):
|
408 | 410 | 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 | + ) |
410 | 414 | self.search_type, self.attribute_key = self.resolve_attribute_key(key, snuba_params)
|
411 | 415 |
|
412 | 416 | def resolve_attribute_key(
|
|
0 commit comments