Skip to content

Commit

Permalink
Revert "perf(trace-explorer): Service Entry spans always have group 0 (
Browse files Browse the repository at this point in the history
…#72817)"

This reverts commit 0d4df7e.

Co-authored-by: Zylphrex <10239353+Zylphrex@users.noreply.github.com>
  • Loading branch information
getsentry-bot and Zylphrex committed Jun 18, 2024
1 parent 7eb792b commit 9ebd80d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
11 changes: 2 additions & 9 deletions src/sentry/api/endpoints/organization_traces.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
SpansIndexedQueryBuilder,
TimeseriesSpanIndexedQueryBuilder,
)
from sentry.search.events.constants import TIMEOUT_SPAN_ERROR_MESSAGE, UNCLASSIFIED_SPAN_GROUP
from sentry.search.events.constants import TIMEOUT_SPAN_ERROR_MESSAGE
from sentry.search.events.types import ParamsType, QueryBuilderConfig, SnubaParams, WhereType
from sentry.sentry_metrics.querying.samples_list import SpanKey, get_sample_list_executor_cls
from sentry.services.hybrid_cloud.organization import RpcOrganization
Expand Down Expand Up @@ -854,18 +854,11 @@ def get_traces_breakdown_projects_query(
) -> QueryBuilder:
trace_ids_str = ",".join(trace_ids)
trace_ids_condition = f"trace:[{trace_ids_str}]"
query = " ".join(
[
"is_transaction:1", # service entry spans
f"group:{UNCLASSIFIED_SPAN_GROUP}", # service entry spans do not have a group
trace_ids_condition,
],
)
return SpansIndexedQueryBuilder(
Dataset.SpansIndexed,
params,
snuba_params=snuba_params,
query=query,
query=f"is_transaction:1 {trace_ids_condition}",
selected_columns=[
"trace",
"project",
Expand Down
3 changes: 0 additions & 3 deletions src/sentry/search/events/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@
SPAN_DESCRIPTION = "span.description"
SPAN_STATUS = "span.status"

# Not all spans get a group assigned to it. Unassigned ones has a default of 0.
UNCLASSIFIED_SPAN_GROUP = "00"


class ThresholdDict(TypedDict):
poor: float
Expand Down
3 changes: 1 addition & 2 deletions src/sentry/sentry_metrics/querying/samples_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
QueryBuilder,
SpansIndexedQueryBuilder,
)
from sentry.search.events.constants import UNCLASSIFIED_SPAN_GROUP
from sentry.search.events.types import ParamsType, QueryBuilderConfig, SelectType, SnubaParams
from sentry.snuba.dataset import Dataset
from sentry.snuba.metrics.naming_layer.mri import (
Expand Down Expand Up @@ -278,7 +277,7 @@ def get_matching_spans_from_traces(

return [
SpanKey(
group=UNCLASSIFIED_SPAN_GROUP,
group="00", # all segments have a group of `00` currently
timestamp=row["timestamp"],
span_id=row["span_id"],
)
Expand Down

0 comments on commit 9ebd80d

Please sign in to comment.