query precedence

Author: mjq

src/sentry/profiles/flamegraph.py

@@ -452,7 +452,11 @@ def get_profile_candidates_from_profiles(self) -> ProfileCandidates:
         max_profiles = options.get("profiling.flamegraph.profile-set.size")
 
         transaction_constraint = "is_transaction:true"
-        query = f"{transaction_constraint} {self.query}" if self.query else transaction_constraint
+        query = (
+            f"({transaction_constraint}) and ({self.query})"
+            if self.query
+            else transaction_constraint
+        )
         results = self.get_spans_based_candidates(query=query, limit=max_profiles)
 
         transaction_profile_candidates: list[TransactionProfileCandidate] = [
@@ -616,7 +620,7 @@ def get_spans_based_candidates(self, query: str | None, limit: int) -> EAPRespon
         # add constraints in order to fetch only spans with profiles
         profiling_constraint = "(has:profile.id) or (has:profiler.id has:thread.id)"
         if query is not None and len(query) > 0:
-            query = f"{query} and {profiling_constraint}"
+            query = f"({query}) and ({profiling_constraint})"
         else:
             query = profiling_constraint
         return Spans.run_table_query(