Skip to content

Commit 667feb7

Browse files
committed
no otlp endpoint and fix build issues
1 parent 13e98da commit 667feb7

File tree

7 files changed

+11
-33
lines changed

7 files changed

+11
-33
lines changed

Cargo.lock

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/audit/src/bin/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ async fn main() -> Result<()> {
101101
args.tracing_otlp_endpoint.clone(),
102102
)?;
103103
}
104-
104+
105105
let consumer = create_kafka_consumer(&args.kafka_properties_file)?;
106106
consumer.subscribe(&[&args.kafka_topic])?;
107107

crates/common/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use anyhow::Context;
22
use opentelemetry::trace::TracerProvider;
33
use opentelemetry::{global, KeyValue};
4-
use opentelemetry_otlp::{SpanExporter, WithExportConfig};
4+
use opentelemetry_otlp::SpanExporter;
55
use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::SdkTracerProvider, Resource};
66
use tracing_opentelemetry::OpenTelemetryLayer;
77
use tracing_subscriber::{
@@ -13,13 +13,12 @@ use tracing_subscriber::{
1313
pub fn init_tracing(
1414
service_name: String,
1515
service_version: String,
16-
otlp_endpoint: String,
16+
_otlp_endpoint: String,
1717
) -> anyhow::Result<()> {
1818
global::set_text_map_propagator(TraceContextPropagator::new());
1919

2020
let otlp_exporter = SpanExporter::builder()
2121
.with_tonic()
22-
.with_endpoint(otlp_endpoint)
2322
.build()
2423
.context("Failed to create OTLP exporter")?;
2524

crates/ingress-rpc/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ op-revm.workspace = true
3535
revm-context-interface.workspace = true
3636
alloy-signer-local.workspace = true
3737
reth-optimism-evm.workspace = true
38+
tips-common.workspace = true

crates/ingress-rpc/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ struct Config {
5858
default_value = "10800"
5959
)]
6060
send_transaction_default_lifetime_seconds: u64,
61+
6162
#[arg(long, env = "TIPS_INGRESS_TRACING_ENABLED", default_value = "false")]
6263
tracing_enabled: bool,
6364

crates/ingress-writer/src/main.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ async fn main() -> Result<()> {
147147

148148
let config = load_kafka_config_from_file(&args.kafka_properties_file)?;
149149
let kafka_producer: FutureProducer = config.create()?;
150+
150151
if args.tracing_enabled {
151152
init_tracing(
152153
env!("CARGO_PKG_NAME").to_string(),
@@ -155,15 +156,6 @@ async fn main() -> Result<()> {
155156
)?;
156157
}
157158

158-
let mut config = ClientConfig::new();
159-
config
160-
.set("group.id", &args.kafka_group_id)
161-
.set("bootstrap.servers", &args.kafka_brokers)
162-
.set("auto.offset.reset", "earliest")
163-
.set("enable.partition.eof", "false")
164-
.set("session.timeout.ms", "6000")
165-
.set("enable.auto.commit", "true");
166-
167159
let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.audit_topic.clone());
168160
let consumer = config.create()?;
169161

crates/maintenance/src/main.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ use rdkafka::ClientConfig;
1111
use rdkafka::producer::FutureProducer;
1212
use std::fs;
1313
use std::sync::Arc;
14-
use std::time::Duration;
15-
use tips_audit::{KafkaMempoolEventPublisher, MempoolEvent, MempoolEventPublisher};
14+
use tips_audit::KafkaBundleEventPublisher;
1615
use tips_common::init_tracing;
17-
use tips_datastore::{BundleDatastore, PostgresDatastore};
18-
use tokio::time::sleep;
19-
use tracing::{error, info, warn};
16+
use tips_datastore::PostgresDatastore;
17+
use tracing::{info, warn};
2018
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
2119
use url::Url;
2220

@@ -115,7 +113,7 @@ async fn main() -> Result<()> {
115113
init_tracing(
116114
env!("CARGO_PKG_NAME").to_string(),
117115
env!("CARGO_PKG_VERSION").to_string(),
118-
args.tracing_otlp_endpoint,
116+
args.tracing_otlp_endpoint.clone(),
119117
)?;
120118
}
121119

0 commit comments

Comments
 (0)