Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions rust_snuba/benches/processors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ fn create_factory(
join_timeout_ms: None,
health_check: "arroyo".to_string(),
use_row_binary: false,
blq_producer_config: None,
blq_topic: None,
};
Box::new(factory)
}
Expand Down
13 changes: 0 additions & 13 deletions rust_snuba/src/consumer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,6 @@ pub fn consumer_impl(
// DLQ policy applies only if we are not skipping writes, otherwise we don't want to be
// writing to the DLQ topics in prod.

let blq_producer_config = consumer_config.dlq_topic.as_ref().map(|dlq_topic_config| {
let mut overrides = dlq_topic_config.broker_config.clone();
overrides.insert("message.max.bytes".to_string(), "10000000".to_string()); // 10 MB, broker max
KafkaConfig::new_producer_config(vec![], Some(overrides))
});

let dlq_topic = consumer_config
.dlq_topic
.as_ref()
.map(|dlq_topic_config| Topic::new(&dlq_topic_config.physical_topic_name));

let dlq_policy = consumer_config.dlq_topic.map(|dlq_topic_config| {
let producer = KafkaProducer::new(KafkaConfig::new_producer_config(
vec![],
Expand Down Expand Up @@ -289,8 +278,6 @@ pub fn consumer_impl(
join_timeout_ms,
health_check: health_check.to_string(),
use_row_binary,
blq_producer_config: blq_producer_config.clone(),
blq_topic: dlq_topic,
};

let processor = StreamProcessor::with_kafka(config, factory, topic, dlq_policy);
Expand Down
22 changes: 0 additions & 22 deletions rust_snuba/src/factory_v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use crate::metrics::global_tags::set_global_tag;
use crate::processors::{self, get_cogs_label};
use crate::strategies::accountant::RecordCogs;

use crate::strategies::blq_router::BLQRouter;
use crate::strategies::clickhouse::writer_v2::{ClickhouseWriterStep, InsertFormat};
use crate::strategies::commit_log::ProduceCommitLog;
use crate::strategies::healthcheck::HealthCheck as SnubaHealthCheck;
Expand Down Expand Up @@ -63,8 +62,6 @@ pub struct ConsumerStrategyFactoryV2 {
pub join_timeout_ms: Option<u64>,
pub health_check: String,
pub use_row_binary: bool,
pub blq_producer_config: Option<KafkaConfig>,
pub blq_topic: Option<Topic>,
}

impl ProcessingStrategyFactory<KafkaPayload> for ConsumerStrategyFactoryV2 {
Expand Down Expand Up @@ -291,25 +288,6 @@ impl ProcessingStrategyFactory<KafkaPayload> for ConsumerStrategyFactoryV2 {
Some(Duration::from_millis(self.join_timeout_ms.unwrap_or(0))),
);

let next_step: Box<dyn ProcessingStrategy<KafkaPayload>> =
if let (Some(blq_producer_config), Some(blq_topic)) =
(&self.blq_producer_config, self.blq_topic)
{
tracing::info!(
"Routing stale messages to the backlog-queue topic {:?} \
(thresholds configured via sentry-options)",
self.blq_topic,
);
Box::new(BLQRouter::new(
next_step,
blq_producer_config.clone(),
blq_topic,
))
} else {
tracing::info!("Not using a backlog-queue",);
Box::new(next_step)
};

if let Some(path) = &self.health_check_file {
{
if self.health_check == "snuba" {
Expand Down
Loading
Loading