Skip to content

Commit 76a53dd

Browse files
committed
fix: All tests other than FeatureAdoption
1 parent 2181ea8 commit 76a53dd

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

src/sentry/spans/consumers/process_segments/message.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,6 @@ def process_segment(spans: list[Span]) -> list[Span]:
330330
if options.get("standalone-spans.send-occurrence-to-platform.enable"):
331331
_send_occurrence_to_platform(jobs, projects)
332332

333-
_record_transaction_info(jobs, projects)
333+
_record_transaction_info(jobs, projects, skip_send_first_transaction=False)
334334

335335
return spans

tests/sentry/event_manager/test_event_manager.py

+21-7
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
from arroyo.types import Partition, Topic
1717
from django.conf import settings
1818
from django.core.cache import cache
19+
from django.db.models import F
1920
from django.utils import timezone
2021

2122
from sentry import eventstore, nodestore, tsdb
2223
from sentry.attachments import CachedAttachment, attachment_cache
23-
from sentry.constants import MAX_VERSION_LENGTH, DataCategory
24+
from sentry.constants import MAX_VERSION_LENGTH, DataCategory, InsightModules
2425
from sentry.dynamic_sampling import (
2526
ExtendedBoostedRelease,
2627
Platform,
@@ -59,6 +60,7 @@
5960
from sentry.models.grouprelease import GroupRelease
6061
from sentry.models.groupresolution import GroupResolution
6162
from sentry.models.grouptombstone import GroupTombstone
63+
from sentry.models.project import Project
6264
from sentry.models.pullrequest import PullRequest, PullRequestCommit
6365
from sentry.models.release import Release
6466
from sentry.models.releasecommit import ReleaseCommit
@@ -1577,15 +1579,19 @@ def test_transaction_sampler_and_receive(self) -> None:
15771579
manager.normalize()
15781580
manager.save(self.project.id)
15791581

1580-
@patch("sentry.event_manager.record_event_processed")
1582+
@patch("sentry.event_manager.record_first_transaction")
1583+
@patch("sentry.event_manager.record_first_insight_span")
15811584
@patch("sentry.event_manager.record_release_received")
15821585
@patch("sentry.ingest.transaction_clusterer.datasource.redis._record_sample")
15831586
def test_transaction_sampler_and_receive_mock_called(
15841587
self,
15851588
mock_record_sample: mock.MagicMock,
15861589
mock_record_release: mock.MagicMock,
1587-
mock_record_event: mock.MagicMock,
1590+
mock_record_insight: mock.MagicMock,
1591+
mock_record_transaction: mock.MagicMock,
15881592
) -> None:
1593+
self.project.update(flags=F("flags").bitand(~Project.flags.has_transactions))
1594+
15891595
manager = EventManager(
15901596
make_event(
15911597
**{
@@ -1606,8 +1612,14 @@ def test_transaction_sampler_and_receive_mock_called(
16061612
"start_timestamp": 0,
16071613
"timestamp": 1,
16081614
"same_process_as_parent": True,
1609-
"op": "default",
1610-
"description": "span a",
1615+
"op": "db.redis",
1616+
"description": "EXEC *",
1617+
"sentry_tags": {
1618+
"description": "EXEC *",
1619+
"category": "db",
1620+
"op": "db.redis",
1621+
"transaction": "/app/index",
1622+
},
16111623
},
16121624
{
16131625
"trace_id": "a0fa8803753e40fd8124b21eeb2986b5",
@@ -1633,6 +1645,7 @@ def test_transaction_sampler_and_receive_mock_called(
16331645
"timestamp": "2019-06-14T14:01:40Z",
16341646
"start_timestamp": "2019-06-14T14:01:40Z",
16351647
"type": "transaction",
1648+
"release": "[email protected]",
16361649
"transaction_info": {
16371650
"source": "url",
16381651
},
@@ -1642,8 +1655,9 @@ def test_transaction_sampler_and_receive_mock_called(
16421655
manager.normalize()
16431656
event = manager.save(self.project.id)
16441657

1645-
mock_record_event.assert_called_once_with(self.project, event)
1646-
mock_record_release.assert_called_once_with(self.project, event)
1658+
mock_record_release.assert_called_once_with(self.project)
1659+
mock_record_insight.assert_called_once_with(self.project, InsightModules.DB)
1660+
mock_record_transaction.assert_called_once_with(self.project, event.datetime)
16471661
assert mock_record_sample.mock_calls == [
16481662
mock.call(ClustererNamespace.TRANSACTIONS, self.project, "wait")
16491663
]

0 commit comments

Comments
 (0)