ref: Reorder project cache dependencies

Author: jan-auer

relay-server/src/actors/project.rs

@@ -24,14 +24,13 @@ use relay_sampling::SamplingConfig;
 
 use crate::actors::events::{EventManager, SendMetrics};
 use crate::actors::outcome::DiscardReason;
+use crate::actors::outcome::OutcomeProducer;
 use crate::actors::project_cache::{FetchProjectState, ProjectCache, ProjectError};
 use crate::envelope::Envelope;
 use crate::extractors::RequestMeta;
 use crate::metrics::RelayCounters;
 use crate::utils::{ActorResponse, EnvelopeLimiter, Response};
 
-use super::outcome::OutcomeProducer;
-
 /// The current status of a project state. Return value of `ProjectState::outdated`.
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub enum Outdated {
@@ -455,12 +454,12 @@ pub struct Project {
     config: Arc<Config>,
     manager: Addr<ProjectCache>,
     event_manager: Addr<EventManager>,
+    outcome_producer: Addr<OutcomeProducer>,
     aggregator: AggregatorState,
     state: Option<Arc<ProjectState>>,
     state_channel: Option<StateChannel>,
     rate_limits: RateLimits,
     last_no_cache: Instant,
-    outcome_producer: Addr<OutcomeProducer>,
 }
 
 impl Project {
@@ -470,19 +469,19 @@ impl Project {
         config: Arc<Config>,
         manager: Addr<ProjectCache>,
         event_manager: Addr<EventManager>,
-        outcome_producer: &Addr<OutcomeProducer>,
+        outcome_producer: Addr<OutcomeProducer>,
     ) -> Self {
         Project {
             public_key: key,
             config,
             manager,
             event_manager,
+            outcome_producer,
             aggregator: AggregatorState::Unknown,
             state: None,
             state_channel: None,
             rate_limits: RateLimits::new(),
             last_no_cache: Instant::now(),
-            outcome_producer: outcome_producer.clone(),
         }
     }
 

relay-server/src/actors/project_cache.rs

@@ -13,15 +13,14 @@ use relay_config::{Config, RelayMode};
 use relay_redis::RedisPool;
 
 use crate::actors::events::EventManager;
+use crate::actors::outcome::OutcomeProducer;
 use crate::actors::project::{Project, ProjectState};
 use crate::actors::project_local::LocalProjectSource;
 use crate::actors::project_upstream::UpstreamProjectSource;
 use crate::actors::upstream::UpstreamRelay;
 use crate::metrics::{RelayCounters, RelayHistograms, RelayTimers};
 use crate::utils::Response;
 
-use super::outcome::OutcomeProducer;
-
 #[cfg(feature = "processing")]
 use {crate::actors::project_redis::RedisProjectSource, relay_common::clone};
 
@@ -46,21 +45,20 @@ pub struct ProjectCache {
     projects: HashMap<ProjectKey, ProjectEntry>,
 
     event_manager: Addr<EventManager>,
+    outcome_producer: Addr<OutcomeProducer>,
     local_source: Addr<LocalProjectSource>,
     upstream_source: Addr<UpstreamProjectSource>,
     #[cfg(feature = "processing")]
     redis_source: Option<Addr<RedisProjectSource>>,
-
-    outcome_producer: Addr<OutcomeProducer>,
 }
 
 impl ProjectCache {
     pub fn new(
         config: Arc<Config>,
         event_manager: Addr<EventManager>,
+        outcome_producer: Addr<OutcomeProducer>,
         upstream_relay: Addr<UpstreamRelay>,
         _redis: Option<RedisPool>,
-        outcome_producer: Addr<OutcomeProducer>,
     ) -> Self {
         let local_source = LocalProjectSource::new(config.clone()).start();
         let upstream_source = UpstreamProjectSource::new(config.clone(), upstream_relay).start();
@@ -81,11 +79,11 @@ impl ProjectCache {
             projects: HashMap::new(),
 
             event_manager,
+            outcome_producer,
             local_source,
             upstream_source,
             #[cfg(feature = "processing")]
             redis_source,
-            outcome_producer,
         }
     }
 
@@ -162,7 +160,7 @@ impl Handler<GetProject> for ProjectCache {
                     config,
                     context.address(),
                     self.event_manager.clone(),
-                    &self.outcome_producer,
+                    self.outcome_producer.clone(),
                 )
                 .start();
 

relay-server/src/service.rs

@@ -142,9 +142,9 @@ impl ServiceState {
         let project_cache = ProjectCache::new(
             config.clone(),
             event_manager.clone(),
+            outcome_producer.clone(),
             upstream_relay.clone(),
             redis_pool,
-            outcome_producer.clone(),
         )
         .start();