ref(project-cache): Revert project cache split and metric meta removal (

#4198) Revert of the PRs: #4147 and #4152 to unblock other deploys.
getsentry · Oct 31, 2024 · c63be13 · c63be13
1 parent f6139ef
commit c63be13
Show file tree

Hide file tree

Showing 55 changed files with 3,482 additions and 2,214 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -553,7 +553,7 @@ jobs:
       - run: make test-integration
         env:
           PYTEST_N: 6
-          RELAY_VERSION_CHAIN: "23.12.0,latest"
+          RELAY_VERSION_CHAIN: "20.6.0,latest"
 
   sentry-relay-integration-tests:
     name: Sentry-Relay Integration Tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,6 @@
 
 ## Unreleased
 
-**Breaking Changes**:
-
-- Removes support for metric meta envelope items. ([#4152](https://github.com/getsentry/relay/pull/4152))
-- Removes support for the project cache endpoint version 2 and before. ([#4147](https://github.com/getsentry/relay/pull/4147))
-
 **Bug Fixes**
 
 - Allow profile chunks without release. ([#4155](https://github.com/getsentry/relay/pull/4155))
@@ -26,7 +21,7 @@
 
 ## 24.10.0
 
-**Breaking Changes**:
+**Breaking Changes:**
 
 - Only allow processing enabled in managed mode. ([#4087](https://github.com/getsentry/relay/pull/4087))
 
@@ -36,7 +31,7 @@
 - Use the duration reported by the profiler instead of the transaction. ([#4058](https://github.com/getsentry/relay/pull/4058))
 - Incorrect pattern matches involving adjacent any and wildcard matchers. ([#4072](https://github.com/getsentry/relay/pull/4072))
 
-**Features**:
+**Features:**
 
 - Add a config option to add default tags to all Relay Sentry events. ([#3944](https://github.com/getsentry/relay/pull/3944))
 - Automatically derive `client.address` and `user.geo` for standalone spans. ([#4047](https://github.com/getsentry/relay/pull/4047))
@@ -48,7 +43,7 @@
 - Add support for creating User from LoginId in Unreal Crash Context. ([#4093](https://github.com/getsentry/relay/pull/4093))
 - Add multi-write Redis client. ([#4064](https://github.com/getsentry/relay/pull/4064))
 
-**Internal**:
+**Internal:**
 
 - Remove unused `cogs.enabled` configuration option. ([#4060](https://github.com/getsentry/relay/pull/4060))
 - Add the dynamic sampling rate to standalone spans as a measurement so that it can be stored, queried, and used for extrapolation. ([#4063](https://github.com/getsentry/relay/pull/4063))

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,7 +60,6 @@ relay-test = { path = "relay-test" }
 relay-protocol-derive = { path = "relay-protocol-derive" }
 relay-event-derive = { path = "relay-event-derive" }
 
-ahash = "0.8.11"
 android_trace_log = { version = "0.3.0", features = ["serde"] }
 anyhow = "1.0.66"
 axum = "0.7.5"
@@ -120,7 +119,6 @@ num-traits = "0.2.18"
 num_cpus = "1.13.0"
 once_cell = "1.13.1"
 opentelemetry-proto = { version = "0.7.0", default-features = false }
-papaya = "0.1.4"
 parking_lot = "0.12.1"
 path-slash = "0.2.1"
 pest = "2.1.3"

diff --git a/relay-cogs/src/lib.rs b/relay-cogs/src/lib.rs
@@ -132,6 +132,9 @@ pub enum AppFeature {
     /// This app feature is for continuous profiling.
     Profiles,
 
+    /// Metric metadata.
+    MetricMeta,
+
     /// Metrics in the transactions namespace.
     MetricsTransactions,
     /// Metrics in the spans namespace.
@@ -165,6 +168,7 @@ impl AppFeature {
             Self::ClientReports => "client_reports",
             Self::CheckIns => "check_ins",
             Self::Replays => "replays",
+            Self::MetricMeta => "metric_meta",
             Self::MetricsTransactions => "metrics_transactions",
             Self::MetricsSpans => "metrics_spans",
             Self::MetricsProfiles => "metrics_profiles",