Skip to content

chore: consolidate agent code for otlp #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
duncanista merged 2 commits into from
Mar 27, 2026
Merged

chore: consolidate agent code for otlp #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3dea50
consolidate agent code for otlp
duncanista Mar 26, 2026
60f21df
update errors on otlp integration test
duncanista Mar 26, 2026
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
55 changes: 15 additions & 40 deletions bottlecap/src/bin/bottlecap/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ use bottlecap::{
},
flusher::LogsFlusher,
},
otlp::{
agent::Agent as OtlpAgent, grpc_agent::GrpcAgent as OtlpGrpcAgent, should_enable_otlp_grpc,
should_enable_otlp_http,
},
otlp::{agent::Agent as OtlpAgent, should_enable_otlp_agent},
proxy::{interceptor, should_start_proxy},
secrets::decrypt,
tags::{
Expand Down Expand Up @@ -1357,49 +1354,27 @@ fn start_otlp_agent(
trace_tx: Sender<SendDataBuilderInfo>,
stats_concentrator: StatsConcentratorHandle,
) -> Option<CancellationToken> {
let http_enabled = should_enable_otlp_http(config);
let grpc_enabled = should_enable_otlp_grpc(config);

if !http_enabled && !grpc_enabled {
if !should_enable_otlp_agent(config) {
return None;
}

let stats_generator = Arc::new(StatsGenerator::new(stats_concentrator));
let cancel_token = CancellationToken::new();

if http_enabled {
let agent = OtlpAgent::new(
config.clone(),
tags_provider.clone(),
trace_processor.clone(),
trace_tx.clone(),
stats_generator.clone(),
cancel_token.clone(),
);

tokio::spawn(async move {
if let Err(e) = agent.start().await {
error!("Error starting OTLP HTTP agent: {e:?}");
}
});
}

if grpc_enabled {
let grpc_agent = OtlpGrpcAgent::new(
config.clone(),
tags_provider,
trace_processor,
trace_tx,
stats_generator,
cancel_token.clone(),
);
let agent = OtlpAgent::new(
config.clone(),
tags_provider,
trace_processor,
trace_tx,
stats_generator,
cancel_token.clone(),
);

tokio::spawn(async move {
if let Err(e) = grpc_agent.start().await {
error!("Error starting OTLP gRPC agent: {e:?}");
}
});
}
tokio::spawn(async move {
if let Err(e) = agent.start().await {
error!("Error starting OTLP agent: {e:?}");
}
});

Some(cancel_token)
}
Expand Down
Loading
Loading