From e7eba0e61448789d480aaef9e3f3d5d658dea69e Mon Sep 17 00:00:00 2001 From: Volo Kluev Date: Mon, 2 Feb 2026 12:43:50 -0500 Subject: [PATCH] prepare settings for production --- .../web/rpc/v1/resolvers/R_eap_items/resolver_time_series.py | 2 +- .../rpc/v1/resolvers/R_eap_items/resolver_trace_item_table.py | 2 +- snuba/web/rpc/v1/resolvers/common/cross_item_queries.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_time_series.py b/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_time_series.py index 097c98479e..8050f4717c 100644 --- a/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_time_series.py +++ b/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_time_series.py @@ -482,7 +482,7 @@ def resolve( # When trace_filters are present and the feature is enabled, don't use sampling on the outer query # The inner query (getting trace IDs) will use sampling cross_item_queries_no_sample_outer = state.get_int_config( - "cross_item_queries_no_sample_outer", 0 + "cross_item_queries_no_sample_outer", 1 ) if not (in_msg.trace_filters and cross_item_queries_no_sample_outer): query_settings.set_sampling_tier(routing_decision.tier) diff --git a/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_trace_item_table.py b/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_trace_item_table.py index a38938d69b..fb7dd31e5c 100644 --- a/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_trace_item_table.py +++ b/snuba/web/rpc/v1/resolvers/R_eap_items/resolver_trace_item_table.py @@ -581,7 +581,7 @@ def resolve( # When trace_filters are present and the feature is enabled, don't use sampling on the outer query # The inner query (getting trace IDs) will use sampling cross_item_queries_no_sample_outer = state.get_int_config( - "cross_item_queries_no_sample_outer", 0 + "cross_item_queries_no_sample_outer", 1 ) if not (in_msg.trace_filters and cross_item_queries_no_sample_outer): query_settings.set_sampling_tier(routing_decision.tier) diff --git a/snuba/web/rpc/v1/resolvers/common/cross_item_queries.py b/snuba/web/rpc/v1/resolvers/common/cross_item_queries.py index 265785da8f..fc6fb1389d 100644 --- a/snuba/web/rpc/v1/resolvers/common/cross_item_queries.py +++ b/snuba/web/rpc/v1/resolvers/common/cross_item_queries.py @@ -32,7 +32,9 @@ treeify_or_and_conditions, ) -_TRACE_LIMIT = 10000 +# 50 million trace ids * 16 bytes per id = a limit of 1gigabyte memory usage per cross item query +# most queries do not hit this number this is just an upper bound +_TRACE_LIMIT = 50_000_000 def convert_trace_filters_to_trace_item_filter_with_type(