test(relay): Add tests for redis-sentinel support

Author: ds

.github/actions/sentinel-cluster/action.yml

@@ -0,0 +1,17 @@
+name: Bring up Redis Sentinel Cluster
+description: >-
+  Installs docker-compose and runs Redis Sentinel cluster
+  with ports 16379-16380 for redis and
+  26379-26380 for sentinel
+runs:
+  using: composite
+  steps:
+    - name: Set up Docker Compose
+      uses: docker/setup-compose-action@364cc21a5de5b1ee4a7f5f9d3fa374ce0ccde746
+
+    - name: Run Sentinel cluster
+      env:
+        ACTION_PATH: ${{ github.action_path }}
+      shell: bash
+      run: |
+        docker compose --file "${ACTION_PATH}/docker-compose.yml" up --detach

.github/actions/sentinel-cluster/docker-compose.yml

@@ -0,0 +1,78 @@
+services:
+  redis-master:
+    image: ghcr.io/getsentry/image-mirror-library-redis:5.0-alpine
+    container_name: redis-master
+    command:
+      - redis-server
+      - --port
+      - "16379"
+    ports:
+      - "16379:16379"
+    networks:
+      - sentinel-cluster
+
+  redis-replica:
+    image: ghcr.io/getsentry/image-mirror-library-redis:5.0-alpine
+    container_name: redis-replica
+    command:
+      - redis-server
+      - --port
+      - "16380"
+      - --replicaof
+      - redis-master
+      - "16379"
+    depends_on:
+      - redis-master
+    ports:
+      - "16380:16380"
+    networks:
+      - sentinel-cluster
+
+  redis-sentinel-1:
+    image: ghcr.io/getsentry/image-mirror-library-redis:5.0-alpine
+    container_name: redis-sentinel-1
+    command:
+      - sh
+      - -ec
+      - |
+        cat <<EOF > /sentinel.conf
+        port 26379
+        sentinel monitor redis-sentry redis-master 16379 2
+        sentinel down-after-milliseconds redis-sentry 5000
+        sentinel parallel-syncs redis-sentry 1
+        sentinel failover-timeout redis-sentry 10000
+        EOF
+        exec redis-server /sentinel.conf --sentinel
+    depends_on:
+      - redis-master
+      - redis-replica
+    ports:
+      - "26379:26379"
+    networks:
+      - sentinel-cluster
+
+  redis-sentinel-2:
+    image: ghcr.io/getsentry/image-mirror-library-redis:5.0-alpine
+    container_name: redis-sentinel-2
+    command:
+      - sh
+      - -ec
+      - |
+        cat <<EOF > /sentinel.conf
+        port 26380
+        sentinel monitor redis-sentry redis-master 16379 2
+        sentinel down-after-milliseconds redis-sentry 5000
+        sentinel parallel-syncs redis-sentry 1
+        sentinel failover-timeout redis-sentry 10000
+        EOF
+        exec redis-server /sentinel.conf --sentinel
+    depends_on:
+      - redis-master
+      - redis-replica
+    ports:
+      - "26380:26380"
+    networks:
+      - sentinel-cluster
+
+networks:
+  sentinel-cluster:

.github/workflows/ci.yml

@@ -777,6 +777,9 @@ jobs:
         with:
           python-version: "3.11"
 
+      - name: Start Redis Sentinel cluster
+        uses: ./.github/actions/sentinel-cluster
+
       - run: make test-integration
         env:
           PYTEST_N: 6

tests/integration/conftest.py

@@ -263,3 +263,9 @@ def redis_client():
 @pytest.fixture
 def secondary_redis_client():
     return redis.Redis(host="127.0.0.1", port=6380, db=0)
+
+
+@pytest.fixture
+def redis_sentinel_client():
+    sentinel = redis.sentinel.Sentinel([("127.0.0.1", 26379), ("127.0.0.1", 26380)])
+    return sentinel.discover_master("redis-sentry")

tests/integration/test_redis_sentinel.py

@@ -0,0 +1,41 @@
+from sentry_sdk.envelope import Envelope
+
+SENTINEL_CONFIG = {
+    "processing": {
+        "redis": {
+            "sentinel_nodes": [
+                "redis://127.0.0.1:26379",
+                "redis://127.0.0.1:26380",
+            ],
+            "master_name": "redis-sentry",
+        }
+    }
+}
+
+
+def test_redis_sentinel(redis_sentinel_client):
+    assert redis_sentinel_client, "Failed to discover redis master"
+
+
+def test_startup_with_redis_sentinel(relay_with_processing):
+    upstream = relay_with_processing(SENTINEL_CONFIG)
+    assert upstream.wait_relay_health_check() is None, "Failed to start Relay"
+
+
+def test_envelope_with_redis_sentinel(mini_sentry, relay_with_processing):
+    project_id = 42
+    mini_sentry.add_basic_project_config(project_id)
+
+    envelope = Envelope()
+    envelope.add_event({"message": "Hello, World!"})
+
+    upstream = relay_with_processing(SENTINEL_CONFIG)
+    response = upstream.send_envelope(
+        project_id,
+        envelope,
+    )
+
+    assert response, "Failed to send event"
+
+    event = mini_sentry.captured_events.get(timeout=1).get_event()
+    assert event["logentry"] == {"formatted": "Hello, World!"}