Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(am1): Remove span count metric #77148

Merged
merged 1 commit into from
Sep 9, 2024
Merged

chore(am1): Remove span count metric #77148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions src/sentry/ingest/consumer/processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import functools
import logging
from collections.abc import Mapping, MutableMapping
from collections.abc import Mapping
from typing import Any

import orjson
Expand Down Expand Up @@ -187,11 +187,6 @@ def process_event(
event_id=event_id,
project_id=project_id,
)

try:
collect_span_metrics(project, data)
except Exception:
pass
elif data.get("type") == "feedback":
if features.has("organizations:user-feedback-ingest", project.organization, actor=None):
save_event_feedback.delay(
Expand Down Expand Up @@ -329,20 +324,3 @@ def process_userreport(message: IngestMessage, project: Project) -> bool:
# If you want to remove this make sure to have triaged all errors in Sentry
logger.exception("userreport.save.crash")
return False


def collect_span_metrics(
project: Project,
data: MutableMapping[str, Any],
):
if not features.has("organizations:am3-tier", project.organization) and not features.has(
"organizations:dynamic-sampling", project.organization
):
amount = (
len(data.get("spans", [])) + 1
) # Segment spans also get added to the total span count.
metrics.incr(
"event.save_event.unsampled.spans.count",
amount=amount,
tags={"organization": project.organization.slug},
)
20 changes: 1 addition & 19 deletions tests/sentry/ingest/ingest_consumer/test_ingest_consumer_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import zipfile
from io import BytesIO
from typing import Any
from unittest.mock import Mock, patch
from unittest.mock import Mock

import orjson
import pytest
Expand All @@ -19,7 +19,6 @@
from sentry import eventstore
from sentry.event_manager import EventManager
from sentry.ingest.consumer.processors import (
collect_span_metrics,
process_attachment_chunk,
process_event,
process_individual_attachment,
Expand All @@ -29,7 +28,6 @@
from sentry.models.eventattachment import EventAttachment
from sentry.models.userreport import UserReport
from sentry.options import set
from sentry.testutils.helpers.features import Feature
from sentry.testutils.pytest.fixtures import django_db_all
from sentry.testutils.skips import requires_snuba, requires_symbolicator
from sentry.usage_accountant import accountant
Expand Down Expand Up @@ -597,19 +595,3 @@ def test_individual_attachments_missing_chunks(default_project, factories, monke
attachments = list(EventAttachment.objects.filter(project_id=project_id, event_id=event_id))

assert not attachments


@django_db_all
def test_collect_span_metrics(default_project):
with Feature({"organizations:dynamic-sampling": True, "organization:am3-tier": True}):
with patch("sentry.ingest.consumer.processors.metrics") as mock_metrics:
assert mock_metrics.incr.call_count == 0
collect_span_metrics(default_project, {"spans": [1, 2, 3]})
assert mock_metrics.incr.call_count == 0

with Feature({"organizations:dynamic-sampling": False, "organization:am3-tier": False}):
with patch("sentry.ingest.consumer.processors.metrics") as mock_metrics:

assert mock_metrics.incr.call_count == 0
collect_span_metrics(default_project, {"spans": [1, 2, 3]})
assert mock_metrics.incr.call_count == 1
Loading