Skip to content

Commit 3fb7d49

Browse files
committed
rename and handle error
1 parent a5ef65d commit 3fb7d49

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

opentelemetry-sdk/benches/log_enabled.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use criterion::{criterion_group, criterion_main, Criterion};
1313
use opentelemetry::logs::{Logger, LoggerProvider};
1414
use opentelemetry_sdk::error::OTelSdkResult;
15-
use opentelemetry_sdk::logs::concurrent_log_processor::SimpleConcurrentProcessor;
15+
use opentelemetry_sdk::logs::concurrent_log_processor::SimpleConcurrentLogProcessor;
1616
use opentelemetry_sdk::logs::{
1717
LogBatch, LogExporter, LogProcessor, SdkLoggerProvider, SimpleLogProcessor,
1818
};
@@ -60,7 +60,7 @@ where
6060
}
6161

6262
fn criterion_benchmark(c: &mut Criterion) {
63-
let processor = SimpleConcurrentProcessor::new(NoopExporter);
63+
let processor = SimpleConcurrentLogProcessor::new(NoopExporter);
6464
benchmark_exporter_enabled_false(c, "exporter_disabled_concurrent_processor", processor);
6565
let simple = SimpleLogProcessor::new(NoopExporter);
6666
benchmark_exporter_enabled_false(c, "exporter_disabled_simple_processor", simple);

opentelemetry-sdk/src/logs/concurrent_log_processor.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use opentelemetry::InstrumentationScope;
1+
use opentelemetry::{otel_info, InstrumentationScope};
22

33
use crate::error::OTelSdkResult;
44

@@ -13,21 +13,27 @@ use super::{LogBatch, LogExporter, LogProcessor, SdkLogRecord};
1313
/// This is intended to be used when exporting to operating system
1414
/// tracing facilities like Windows ETW, Linux TracePoints etc.
1515
#[derive(Debug)]
16-
pub struct SimpleConcurrentProcessor<T: LogExporter> {
16+
pub struct SimpleConcurrentLogProcessor<T: LogExporter> {
1717
exporter: T,
1818
}
1919

20-
impl<T: LogExporter> SimpleConcurrentProcessor<T> {
20+
impl<T: LogExporter> SimpleConcurrentLogProcessor<T> {
2121
/// Creates a new `ConcurrentExportProcessor` with the given exporter.
2222
pub fn new(exporter: T) -> Self {
2323
Self { exporter }
2424
}
2525
}
2626

27-
impl<T: LogExporter> LogProcessor for SimpleConcurrentProcessor<T> {
27+
impl<T: LogExporter> LogProcessor for SimpleConcurrentLogProcessor<T> {
2828
fn emit(&self, record: &mut SdkLogRecord, instrumentation: &InstrumentationScope) {
2929
let log_tuple = &[(record as &SdkLogRecord, instrumentation)];
30-
let _ = futures_executor::block_on(self.exporter.export(LogBatch::new(log_tuple)));
30+
let result = futures_executor::block_on(self.exporter.export(LogBatch::new(log_tuple)));
31+
if let Err(err) = result {
32+
otel_info!(
33+
name: "SimpleConcurrentLogProcessor.Emit.ExportError",
34+
error = format!("{}",err)
35+
);
36+
}
3137
}
3238

3339
fn force_flush(&self) -> OTelSdkResult {

stress/src/logs.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
use opentelemetry_appender_tracing::layer;
2121
use opentelemetry_sdk::error::OTelSdkResult;
22-
use opentelemetry_sdk::logs::concurrent_log_processor::SimpleConcurrentProcessor;
22+
use opentelemetry_sdk::logs::concurrent_log_processor::SimpleConcurrentLogProcessor;
2323
use opentelemetry_sdk::logs::SdkLoggerProvider;
2424
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
2525

@@ -65,7 +65,9 @@ fn main() {
6565

6666
// LoggerProvider with a no-op processor.
6767
let provider: SdkLoggerProvider = SdkLoggerProvider::builder()
68-
.with_log_processor(SimpleConcurrentProcessor::new(NoopExporter::new(enabled)))
68+
.with_log_processor(SimpleConcurrentLogProcessor::new(NoopExporter::new(
69+
enabled,
70+
)))
6971
.build();
7072

7173
// Use the OpenTelemetryTracingBridge to test the throughput of the appender-tracing.

0 commit comments

Comments
 (0)