Skip to content

ref(sentry-metrics): Default to using the postgres indexer #29446

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

Merged
MeredithAnya merged 1 commit into from
Oct 26, 2021
Merged

ref(sentry-metrics): Default to using the postgres indexer #29446

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
1 change: 0 additions & 1 deletion .github/workflows/snuba-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
MATRIX_INSTANCE_TOTAL: 2
USE_SNUBA: 1
MIGRATIONS_TEST_MIGRATE: 1
USE_INDEXER: 1

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/conf/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,7 @@ def create_partitioned_queues(name):
SENTRY_METRICS_SKIP_INTERNAL_PREFIXES = [] # Order this by most frequent prefixes.

# Metrics product
SENTRY_METRICS_INDEXER = "sentry.sentry_metrics.indexer.mock.MockIndexer"
SENTRY_METRICS_INDEXER = "sentry.sentry_metrics.indexer.postgres.PGStringIndexer"
SENTRY_METRICS_INDEXER_OPTIONS = {}
SENTRY_METRICS_INDEXER_CACHE_TTL = 3600 * 2

Expand Down
3 changes: 0 additions & 3 deletions src/sentry/utils/pytest/sentry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ def pytest_configure(config):
settings.SENTRY_TSDB = "sentry.tsdb.redissnuba.RedisSnubaTSDB"
settings.SENTRY_EVENTSTREAM = "sentry.eventstream.snuba.SnubaEventStream"

if os.environ.get("USE_INDEXER", False):
settings.SENTRY_METRICS_INDEXER = "sentry.sentry_metrics.indexer.postgres.PGStringIndexer"

if os.environ.get("DISABLE_TEST_SDK", False):
settings.SENTRY_SDK_CONFIG = {}

Expand Down
14 changes: 11 additions & 3 deletions tests/sentry/snuba/test_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.utils.datastructures import MultiValueDict
from snuba_sdk import Column, Condition, Entity, Granularity, Limit, Offset, Op, Query

from sentry.sentry_metrics.indexer.mock import MockIndexer
from sentry.snuba.metrics import (
MAX_POINTS,
QueryDefinition,
Expand All @@ -24,10 +25,12 @@ class PseudoProject:
MOCK_NOW = datetime(2021, 8, 25, 23, 59, tzinfo=pytz.utc)


@mock.patch("sentry.snuba.metrics.indexer")
@mock.patch("sentry.snuba.sessions_v2.get_now", return_value=MOCK_NOW)
@mock.patch("sentry.api.utils.timezone.now", return_value=MOCK_NOW)
def test_build_snuba_query(mock_now, mock_now2):
def test_build_snuba_query(mock_now, mock_now2, mock_indexer):

mock_indexer.resolve = MockIndexer().resolve
# Your typical release health query querying everything
query_params = MultiValueDict(
{
Expand Down Expand Up @@ -86,9 +89,12 @@ def expected_query(match, select, extra_groupby):
}


@mock.patch("sentry.snuba.metrics.indexer")
@mock.patch("sentry.snuba.sessions_v2.get_now", return_value=MOCK_NOW)
@mock.patch("sentry.api.utils.timezone.now", return_value=MOCK_NOW)
def test_translate_results(_1, _2):
def test_translate_results(_1, _2, mock_indexer):
mock_indexer.reverse_resolve = MockIndexer().reverse_resolve

query_params = MultiValueDict(
{
"groupBy": ["session.status"],
Expand Down Expand Up @@ -236,9 +242,11 @@ def test_translate_results(_1, _2):
]


@mock.patch("sentry.snuba.metrics.indexer")
@mock.patch("sentry.snuba.sessions_v2.get_now", return_value=MOCK_NOW)
@mock.patch("sentry.api.utils.timezone.now", return_value=MOCK_NOW)
def test_translate_results_missing_slots(_1, _2):
def test_translate_results_missing_slots(_1, _2, mock_indexer):
mock_indexer.reverse_resolve = MockIndexer().reverse_resolve
query_params = MultiValueDict(
{
"field": [
Expand Down