Skip to content

Commit ff6d809

Browse files
cijothomaslalitb
authored andcommitted
Nit fix to log message on LogProcessor (open-telemetry#2590)
Co-authored-by: Lalit Kumar Bhasin <[email protected]>
1 parent f67e0b0 commit ff6d809

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

opentelemetry-sdk/src/logs/log_processor.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ impl LogProcessor for BatchLogProcessor {
345345
// a log, emit a warning.
346346
if self.dropped_logs_count.fetch_add(1, Ordering::Relaxed) == 0 {
347347
otel_warn!(name: "BatchLogProcessor.LogDroppingStarted",
348-
message = "BatchLogProcessor dropped a LogRecord due to queue full/internal errors. No further log will be emitted for further drops until Shutdown. During Shutdown time, a log will be emitted with exact count of total logs dropped.");
348+
message = "BatchLogProcessor dropped a LogRecord due to queue full. No further log will be emitted for further drops until Shutdown. During Shutdown time, a log will be emitted with exact count of total logs dropped.");
349349
}
350350
}
351351
Err(mpsc::TrySendError::Disconnected(_)) => {
@@ -378,9 +378,9 @@ impl LogProcessor for BatchLogProcessor {
378378
// If the control message could not be sent, emit a warning.
379379
otel_debug!(
380380
name: "BatchLogProcessor.ForceFlush.ControlChannelFull",
381-
message = "Control message to flush the worker thread could not be sent as the control channel is full. This can occur if user repeatedily calls force_flush without finishing the previous call."
381+
message = "Control message to flush the worker thread could not be sent as the control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call."
382382
);
383-
LogResult::Err(LogError::Other("ForceFlush cannot be performed as Control channel is full. This can occur if user repeatedily calls force_flush without finishing the previous call.".into()))
383+
LogResult::Err(LogError::Other("ForceFlush cannot be performed as Control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call.".into()))
384384
}
385385
Err(mpsc::TrySendError::Disconnected(_)) => {
386386
// Given background thread is the only receiver, and it's
@@ -406,7 +406,7 @@ impl LogProcessor for BatchLogProcessor {
406406
name: "BatchLogProcessor.LogsDropped",
407407
dropped_logs_count = dropped_logs,
408408
max_queue_size = max_queue_size,
409-
message = "Logs were dropped due to a queue being full or other error. The count represents the total count of log records dropped in the lifetime of this BatchLogProcessor. Consider increasing the queue size and/or decrease delay between intervals."
409+
message = "Logs were dropped due to a queue being full. The count represents the total count of log records dropped in the lifetime of this BatchLogProcessor. Consider increasing the queue size and/or decrease delay between intervals."
410410
);
411411
}
412412

@@ -444,9 +444,9 @@ impl LogProcessor for BatchLogProcessor {
444444
// If the control message could not be sent, emit a warning.
445445
otel_debug!(
446446
name: "BatchLogProcessor.Shutdown.ControlChannelFull",
447-
message = "Control message to shutdown the worker thread could not be sent as the control channel is full. This can occur if user repeatedily calls force_flush without finishing the previous call."
447+
message = "Control message to shutdown the worker thread could not be sent as the control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call."
448448
);
449-
LogResult::Err(LogError::Other("Shutdown cannot be performed as Control channel is full. This can occur if user repeatedily calls force_flush without finishing the previous call.".into()))
449+
LogResult::Err(LogError::Other("Shutdown cannot be performed as Control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call.".into()))
450450
}
451451
Err(mpsc::TrySendError::Disconnected(_)) => {
452452
// Given background thread is the only receiver, and it's

0 commit comments

Comments
 (0)