Revert "feat(eap): Allow to coalesce specific attributes (#7269)"

This reverts commit 69a8b3f.

Co-authored-by: volokluev <[email protected]>

Author: getsentry-bot

snuba/web/rpc/v1/endpoint_get_trace.py

@@ -37,7 +37,7 @@
 )
 from snuba.web.rpc.common.exceptions import BadSnubaRPCRequestException
 from snuba.web.rpc.v1.resolvers.R_eap_items.common.common import (
-    attribute_key_to_expression,
+    attribute_key_to_expression_eap_items,
 )
 
 NORMALIZED_COLUMNS_TO_INCLUDE_EAP_ITEMS = [
@@ -53,7 +53,7 @@ def _build_query(request: GetTraceRequest, item: GetTraceRequest.TraceItem) -> Q
         SelectedExpression(
             name="id",
             expression=(
-                attribute_key_to_expression(
+                attribute_key_to_expression_eap_items(
                     AttributeKey(
                         name="sentry.item_id", type=AttributeKey.Type.TYPE_STRING
                     )
@@ -64,7 +64,7 @@ def _build_query(request: GetTraceRequest, item: GetTraceRequest.TraceItem) -> Q
             name="timestamp",
             expression=f.cast(
                 (
-                    attribute_key_to_expression(
+                    attribute_key_to_expression_eap_items(
                         AttributeKey(
                             name="sentry.start_timestamp_precise",
                             type=AttributeKey.Type.TYPE_DOUBLE,
@@ -82,7 +82,7 @@ def _build_query(request: GetTraceRequest, item: GetTraceRequest.TraceItem) -> Q
             selected_columns.append(
                 SelectedExpression(
                     name=attribute_key.name,
-                    expression=(attribute_key_to_expression(attribute_key)),
+                    expression=(attribute_key_to_expression_eap_items(attribute_key)),
                 )
             )
     else:

snuba/web/rpc/v1/endpoint_get_traces.py

@@ -45,7 +45,7 @@
 )
 from snuba.web.rpc.common.exceptions import BadSnubaRPCRequestException
 from snuba.web.rpc.v1.resolvers.R_eap_items.common.common import (
-    attribute_key_to_expression,
+    attribute_key_to_expression_eap_items,
 )
 
 _DEFAULT_ROW_LIMIT = 10_000
@@ -143,7 +143,7 @@ def _get_attribute_expression(
     attribute_type: AttributeKey.Type.ValueType,
     request_meta: RequestMeta,
 ) -> Expression:
-    return attribute_key_to_expression(
+    return attribute_key_to_expression_eap_items(
         AttributeKey(name=attribute_name, type=attribute_type)
     )
 
@@ -427,7 +427,7 @@ def _list_trace_ids(
     ) -> list[str]:
         trace_item_filters_expression = trace_item_filters_to_expression(
             _select_supported_filters(request.filters),
-            (attribute_key_to_expression),
+            (attribute_key_to_expression_eap_items),
         )
         selected_columns: list[SelectedExpression] = [
             SelectedExpression(
@@ -491,7 +491,7 @@ def _get_metadata_for_traces(
     ) -> list[GetTracesResponse.Trace]:
         trace_item_filters_expression = trace_item_filters_to_expression(
             _select_supported_filters(request.filters),
-            (attribute_key_to_expression),
+            (attribute_key_to_expression_eap_items),
         )
 
         selected_columns: list[SelectedExpression] = []