Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@iambriccardo
iambriccardo committed Jul 18, 2024
1 parent cc0596d commit 1d3b3e8
Show file tree
Hide file tree
Showing 18 changed files with 330 additions and 661 deletions.
4 changes: 2 additions & 2 deletions relay-server/src/endpoints/common.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ fn queue_envelope(
// Split off the envelopes by item type.
let envelopes = ProcessingGroup::split_envelope(*managed_envelope.take_envelope());
for (group, envelope) in envelopes {
let envelope = ManagedEnvelope::standalone(
let envelope = ManagedEnvelope::new(
envelope,
state.outcome_aggregator().clone(),
state.test_store().clone(),
Expand Down Expand Up @@ -335,7 +335,7 @@ pub async fn handle_envelope(
return Err(BadStoreRequest::QueueFailed);
};

let mut managed_envelope = ManagedEnvelope::standalone(
let mut managed_envelope = ManagedEnvelope::new(
envelope,
state.outcome_aggregator().clone(),
state.test_store().clone(),
Expand Down
2 changes: 1 addition & 1 deletion relay-server/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::services::relays::{RelayCache, RelayCacheService};
use crate::services::store::StoreService;
use crate::services::test_store::{TestStore, TestStoreService};
use crate::services::upstream::{UpstreamRelay, UpstreamRelayService};
use crate::utils::{BufferGuard, MemoryStat, MemoryStatConfig};
use crate::utils::{MemoryStat, MemoryStatConfig};

/// Indicates the type of failure of the server.
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, thiserror::Error)]
Expand Down
2 changes: 1 addition & 1 deletion relay-server/src/services/health_check.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::services::metrics::{AcceptsMetrics, Aggregator};
use crate::services::project_cache::{ProjectCache, SpoolHealth};
use crate::services::upstream::{IsAuthenticated, UpstreamRelay};
use crate::statsd::RelayTimers;
use crate::utils::{MemoryStat, MemoryStatConfig};
use crate::utils::MemoryStatConfig;

/// Checks whether Relay is alive and healthy based on its variant.
#[derive(Clone, Copy, Debug, serde::Deserialize)]
Expand Down
10 changes: 5 additions & 5 deletions relay-server/src/services/processor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2295,7 +2295,7 @@ impl EnvelopeProcessorService {
envelope.add_item(item);
}

let envelope = ManagedEnvelope::standalone(
let envelope = ManagedEnvelope::new(
envelope,
self.inner.addrs.outcome_aggregator.clone(),
self.inner.addrs.test_store.clone(),
Expand Down Expand Up @@ -2589,7 +2589,7 @@ impl EnvelopeProcessorService {
item.set_payload(ContentType::Json, serde_json::to_vec(&buckets).unwrap());
envelope.add_item(item);

let mut envelope = ManagedEnvelope::standalone(
let mut envelope = ManagedEnvelope::new(
envelope,
self.inner.addrs.outcome_aggregator.clone(),
self.inner.addrs.test_store.clone(),
Expand Down Expand Up @@ -2725,7 +2725,7 @@ impl EnvelopeProcessorService {
let mut envelope = Envelope::from_request(None, RequestMeta::outbound(dsn));
envelope.add_item(item);

let envelope = ManagedEnvelope::standalone(
let envelope = ManagedEnvelope::new(
envelope,
self.inner.addrs.outcome_aggregator.clone(),
self.inner.addrs.test_store.clone(),
Expand Down Expand Up @@ -3397,7 +3397,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);

let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group);
let envelope = ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group);

let message = ProcessEnvelope {
envelope,
Expand Down Expand Up @@ -3454,7 +3454,7 @@ mod tests {
envelope.add_item(item);

let (outcome_aggregator, test_store) = testutils::processor_services();
let managed_envelope = ManagedEnvelope::standalone(
let managed_envelope = ManagedEnvelope::new(
envelope,
outcome_aggregator,
test_store,
Expand Down
7 changes: 3 additions & 4 deletions relay-server/src/services/processor/dynamic_sampling.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ mod tests {
use crate::testutils::{
self, create_test_processor, new_envelope, state_with_rule_and_condition,
};
use crate::utils::{ManagedEnvelope, Semaphore as TestSemaphore};
use crate::utils::ManagedEnvelope;

use super::*;

Expand Down Expand Up @@ -323,7 +323,7 @@ mod tests {
let (group, envelope) = envelopes.pop().unwrap();

let message = ProcessEnvelope {
envelope: ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group),
envelope: ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group),
project_state: Arc::new(ProjectState::allowed()),
sampling_project_state,
reservoir_counters: ReservoirCounters::default(),
Expand Down Expand Up @@ -471,7 +471,6 @@ mod tests {
project_id: ProjectId::new(42),
managed_envelope: ManagedEnvelope::new(
envelope,
TestSemaphore::new(42).try_acquire().unwrap(),
outcome_aggregator.clone(),
test_store.clone(),
ProcessingGroup::Transaction,
Expand Down Expand Up @@ -774,7 +773,7 @@ mod tests {
Some(Arc::new(state))
},
project_id: ProjectId::new(1),
managed_envelope: ManagedEnvelope::standalone(
managed_envelope: ManagedEnvelope::new(
envelope,
Addr::dummy(),
Addr::dummy(),
Expand Down
9 changes: 4 additions & 5 deletions relay-server/src/services/processor/profile.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);

let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, Addr::dummy(), Addr::dummy(), group);
let envelope = ManagedEnvelope::new(envelope, Addr::dummy(), Addr::dummy(), group);

let message = ProcessEnvelope {
envelope,
Expand Down Expand Up @@ -389,7 +389,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);

let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, Addr::dummy(), Addr::dummy(), group);
let envelope = ManagedEnvelope::new(envelope, Addr::dummy(), Addr::dummy(), group);

let message = ProcessEnvelope {
envelope,
Expand Down Expand Up @@ -458,8 +458,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);

let (group, envelope) = envelopes.pop().unwrap();
let envelope =
ManagedEnvelope::standalone(envelope.clone(), Addr::dummy(), Addr::dummy(), group);
let envelope = ManagedEnvelope::new(envelope.clone(), Addr::dummy(), Addr::dummy(), group);

let message = ProcessEnvelope {
envelope,
Expand Down Expand Up @@ -530,7 +529,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);

let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, Addr::dummy(), Addr::dummy(), group);
let envelope = ManagedEnvelope::new(envelope, Addr::dummy(), Addr::dummy(), group);

let message = ProcessEnvelope {
envelope,
Expand Down
10 changes: 5 additions & 5 deletions relay-server/src/services/processor/report.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);
let (group, envelope) = envelopes.pop().unwrap();

let envelope = ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group);
let envelope = ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group);
let message = ProcessEnvelope {
envelope,
project_state: Arc::new(ProjectState::allowed()),
Expand Down Expand Up @@ -368,7 +368,7 @@ mod tests {
let mut envelopes = ProcessingGroup::split_envelope(*envelope);
assert_eq!(envelopes.len(), 1);
let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group);
let envelope = ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group);

let message = ProcessEnvelope {
envelope,
Expand Down Expand Up @@ -431,7 +431,7 @@ mod tests {
assert_eq!(envelopes.len(), 1);

let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group);
let envelope = ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group);
let message = ProcessEnvelope {
envelope,
project_state: Arc::new(ProjectState::allowed()),
Expand Down Expand Up @@ -471,7 +471,7 @@ mod tests {

let (group, envelope) = envelopes.pop().unwrap();

let envelope = ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group);
let envelope = ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group);
let message = ProcessEnvelope {
envelope,
project_state: Arc::new(ProjectState::allowed()),
Expand Down Expand Up @@ -518,7 +518,7 @@ mod tests {
let mut envelopes = ProcessingGroup::split_envelope(*envelope);
assert_eq!(envelopes.len(), 1);
let (group, envelope) = envelopes.pop().unwrap();
let envelope = ManagedEnvelope::standalone(envelope, outcome_aggregator, test_store, group);
let envelope = ManagedEnvelope::new(envelope, outcome_aggregator, test_store, group);

let message = ProcessEnvelope {
envelope,
Expand Down
2 changes: 1 addition & 1 deletion relay-server/src/services/processor/span/processing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ mod tests {
..Default::default()
};

let managed_envelope = ManagedEnvelope::standalone(
let managed_envelope = ManagedEnvelope::new(
dummy_envelope,
Addr::dummy(),
Addr::dummy(),
Expand Down
2 changes: 1 addition & 1 deletion relay-server/src/services/project.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,7 @@ mod tests {
let (outcome_aggregator, mut outcome_aggregator_rx) = Addr::custom();
let (test_store, _) = Addr::custom();

let managed_envelope = ManagedEnvelope::standalone(
let managed_envelope = ManagedEnvelope::new(
envelope,
outcome_aggregator.clone(),
test_store,
Expand Down
Loading

0 comments on commit 1d3b3e8

Please sign in to comment.