Skip to content
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

Nit improvements to batchprocessors #2466

Merged
merged 2 commits into from
Dec 24, 2024
Merged

Nit improvements to batchprocessors #2466

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cc9b14
Nit improvements to batchprocessors
cijothomas Dec 23, 2024
f787817
fix message
cijothomas Dec 24, 2024
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
36 changes: 24 additions & 12 deletions opentelemetry-sdk/src/logs/log_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,35 +337,42 @@
match message_receiver.recv_timeout(remaining_time) {
Ok(BatchMessage::ExportLog(log)) => {
logs.push(log);
if logs.len() == config.max_export_batch_size
|| last_export_time.elapsed() >= config.scheduled_delay
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
{
if logs.len() == config.max_export_batch_size {
otel_debug!(
name: "BatchLogProcessor.ExportingDueToBatchSize",
);

Check warning on line 343 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L341-L343 

Added lines #L341 - L343 were not covered by tests
let _ = export_with_timeout_sync(
remaining_time,
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
config.max_export_timeout,

Check warning on line 345 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L345 

Added line #L345 was not covered by tests
&mut exporter,
logs.split_off(0),
&mut last_export_time,
);
}
}
Ok(BatchMessage::ForceFlush(sender)) => {
otel_debug!(name: "BatchLogProcessor.ExportingDueToForceFlush");
let result = export_with_timeout_sync(
remaining_time,
config.max_export_timeout,
&mut exporter,
logs.split_off(0),
&mut last_export_time,
);
let _ = sender.send(result);
}
Ok(BatchMessage::Shutdown(sender)) => {
otel_debug!(name: "BatchLogProcessor.ExportingDueToShutdown");
let result = export_with_timeout_sync(
remaining_time,
config.max_export_timeout,
&mut exporter,
logs.split_off(0),
&mut last_export_time,
);
let _ = sender.send(result);

otel_debug!(
name: "BatchLogProcessor.ThreadExiting",
reason = "ShutdownRequested"
);
//
// break out the loop and return from the current background thread.
//
Expand All @@ -375,19 +382,24 @@
exporter.set_resource(&resource);
}
Err(RecvTimeoutError::Timeout) => {
otel_debug!(
name: "BatchLogProcessor.ExportingDueToTimer",
);

Check warning on line 387 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L385-L387 

Added lines #L385 - L387 were not covered by tests
let _ = export_with_timeout_sync(
remaining_time,
config.max_export_timeout,

Check warning on line 389 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L389 

Added line #L389 was not covered by tests
&mut exporter,
logs.split_off(0),
&mut last_export_time,
);
}
Err(err) => {
// TODO: this should not happen! Log the error and continue for now.
otel_error!(
name: "BatchLogProcessor.InternalError",
error = format!("{}", err)
Err(RecvTimeoutError::Disconnected) => {
// Channel disconnected, only thing to do is break
// out (i.e exit the thread)
otel_debug!(
name: "BatchLogProcessor.ThreadExiting",
reason = "MessageReceiverDisconnected"

Check warning on line 400 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L398-L400 

Added lines #L398 - L400 were not covered by tests
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
);
break;

Check warning on line 402 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L402 

Added line #L402 was not covered by tests
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions opentelemetry-sdk/src/trace/span_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,11 @@ impl BatchSpanProcessor {
}
}
Err(RecvTimeoutError::Disconnected) => {
otel_error!(
name: "BatchSpanProcessor.InternalError.ChannelDisconnected",
message = "Channel disconnected, shutting down processor thread."
// Channel disconnected, only thing to do is break
// out (i.e exit the thread)
otel_debug!(
name: "BatchSpanProcessor.ThreadExiting",
reason = "MessageReceiverDisconnected"
cijothomas marked this conversation as resolved.
Show resolved Hide resolved
);
break;
}
Expand Down
Loading