Merge remote-tracking branch 'origin' into add-mutations-topic

getsentry · Sep 20, 2024 · be132c1 · be132c1
2 parents 370841c + efa8f8b
commit be132c1
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 56 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -27,7 +27,7 @@ python-dateutil==2.8.2
 python-rapidjson==1.8
 redis==4.3.4
 sentry-arroyo==2.17.6
-sentry-kafka-schemas==0.1.106
+sentry-kafka-schemas==0.1.110
 sentry-redis-tools==0.3.0
 sentry-relay==0.8.44
 sentry-sdk==1.40.5

diff --git a/rust_snuba/Cargo.lock b/rust_snuba/Cargo.lock
diff --git a/rust_snuba/Cargo.toml b/rust_snuba/Cargo.toml
@@ -33,7 +33,7 @@ pyo3 = { version = "0.18.1", features = ["chrono"] }
 reqwest = { version = "0.11.11", features = ["stream"] }
 rust_arroyo = { version = "*", git = "https://github.com/getsentry/arroyo" }
 sentry = { version = "0.32.0", features = ["anyhow", "tracing"] }
-sentry-kafka-schemas = "0.1.106"
+sentry-kafka-schemas = "0.1.110"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 thiserror = "1.0"

diff --git a/snuba/datasets/configuration/events_analytics_platform/storages/spans_num_attrs.yaml b/snuba/datasets/configuration/events_analytics_platform/storages/spans_num_attrs.yaml
@@ -6,7 +6,7 @@ storage:
   key: spans_num_attrs
   set_key: events_analytics_platform
 
-readiness_state: limited
+readiness_state: partial
 
 schema:
   columns:

diff --git a/snuba/datasets/configuration/events_analytics_platform/storages/spans_str_attrs.yaml b/snuba/datasets/configuration/events_analytics_platform/storages/spans_str_attrs.yaml
@@ -6,7 +6,7 @@ storage:
   key: spans_str_attrs
   set_key: events_analytics_platform
 
-readiness_state: limited
+readiness_state: partial
 
 schema:
   columns:

diff --git a/snuba/datasets/configuration/replays/entities/replays.yaml b/snuba/datasets/configuration/replays/entities/replays.yaml
@@ -113,6 +113,15 @@ schema:
             [{ name: key, type: String }, { name: value, type: String }],
         },
     },
+    {
+      name: _tags_hash_map,
+      type: Array,
+      args:
+        {
+          schema_modifiers: [readonly],
+          inner_type: { type: UInt, args: { size: 64 } },
+        },
+    },
     { name: click_node_id, type: UInt, args: { size: 32 } },
     { name: click_tag, type: String, args: {} },
     { name: click_id, type: String, args: {} },

diff --git a/snuba/datasets/configuration/replays/storages/replays.yaml b/snuba/datasets/configuration/replays/storages/replays.yaml
@@ -134,6 +134,15 @@ schema:
               [{ name: key, type: String }, { name: value, type: String }],
           },
       },
+      {
+        name: _tags_hash_map,
+        type: Array,
+        args:
+          {
+            schema_modifiers: [readonly],
+            inner_type: { type: UInt, args: { size: 64 } },
+          },
+      },
       { name: click_node_id, type: UInt, args: { size: 32 } },
       {
         name: click_tag,

diff --git a/snuba/web/delete_query.py b/snuba/web/delete_query.py
@@ -125,7 +125,7 @@ def _delete_from_table(
 
 
 def deletes_are_enabled() -> bool:
-    return bool(get_config("storage_deletes_enabled", 0))
+    return bool(get_config("storage_deletes_enabled", 1))
 
 
 def _get_rows_to_delete(

diff --git a/snuba/web/rpc/common.py b/snuba/web/rpc/common.py
@@ -26,7 +26,7 @@ def truncate_request_meta_to_day(meta: RequestMeta) -> None:
     start_timestamp = datetime.utcfromtimestamp(meta.start_timestamp.seconds)
     end_timestamp = datetime.utcfromtimestamp(meta.end_timestamp.seconds)
     start_timestamp = start_timestamp.replace(
-        day=start_timestamp.day, hour=0, minute=0, second=0, microsecond=0
+        day=start_timestamp.day - 1, hour=0, minute=0, second=0, microsecond=0
     )
     end_timestamp = end_timestamp.replace(
         day=end_timestamp.day + 1, hour=0, minute=0, second=0, microsecond=0

diff --git a/tests/test_search_issues_api.py b/tests/test_search_issues_api.py
@@ -198,7 +198,6 @@ def test_bad_delete(self) -> None:
         assert "'query' is a required property" in res.get_json()["error"]["message"]
 
         # test for invalid column types
-        set_config("storage_deletes_enabled", 1)
         res = self.app.delete(
             "/search_issues/",
             data=json.dumps(

diff --git a/tests/web/rpc/test_trace_item_attribute_list.py b/tests/web/rpc/test_trace_item_attribute_list.py
@@ -62,7 +62,6 @@ def setup_teardown(clickhouse_db: None, redis_db: None) -> None:
     write_raw_unprocessed_events(spans_storage, messages)  # type: ignore
 
 
-@pytest.mark.skip(reason="temporarily disabled to allow a migration to run")
 @pytest.mark.clickhouse_db
 @pytest.mark.redis_db
 class TestTraceItemAttributes(BaseApiTest):

diff --git a/tests/web/rpc/test_trace_item_attribute_values.py b/tests/web/rpc/test_trace_item_attribute_values.py
@@ -84,7 +84,6 @@ def setup_teardown(clickhouse_db: None, redis_db: None) -> None:
     write_raw_unprocessed_events(spans_storage, messages)  # type: ignore
 
 
-@pytest.mark.skip(reason="temporarily disabled to allow a migration to run")
 @pytest.mark.clickhouse_db
 @pytest.mark.redis_db
 class TestTraceItemAttributes(BaseApiTest):