Skip to content

Commit 752ea93

Browse files
committed
Move previous BatchLogProcessor to a feature flag and rename it
1 parent 219ad72 commit 752ea93

File tree

8 files changed

+290
-19
lines changed

8 files changed

+290
-19
lines changed

opentelemetry-appender-log/examples/logs-basic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ async fn main() {
1616
let exporter = LogExporter::default();
1717
//Create a LoggerProvider and register the exporter
1818
let logger_provider = LoggerProvider::builder()
19-
.with_log_processor(BatchLogProcessor::builder(exporter, runtime::Tokio).build())
19+
.with_log_processor(BatchLogProcessor::builder(exporter).build())
2020
.build();
2121

2222
// Setup Log Appender for the log crate.

opentelemetry-appender-tracing/src/layer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ mod tests {
296296
async fn batch_processor_no_deadlock() {
297297
let exporter: ReentrantLogExporter = ReentrantLogExporter;
298298
let logger_provider = LoggerProvider::builder()
299-
.with_batch_exporter(exporter.clone(), opentelemetry_sdk::runtime::Tokio)
299+
.with_batch_exporter(exporter.clone())
300300
.build();
301301

302302
let layer = layer::OpenTelemetryTracingBridge::new(&logger_provider);

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fn init_logs() -> Result<sdklogs::LoggerProvider, opentelemetry_sdk::logs::LogEr
3737
.build()?;
3838

3939
Ok(LoggerProvider::builder()
40-
.with_batch_exporter(exporter, runtime::Tokio)
40+
.with_batch_exporter(exporter)
4141
.with_resource(RESOURCE.clone())
4242
.build())
4343
}

opentelemetry-otlp/examples/basic-otlp/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn init_logs() -> Result<opentelemetry_sdk::logs::LoggerProvider, LogError> {
4949

5050
Ok(LoggerProvider::builder()
5151
.with_resource(RESOURCE.clone())
52-
.with_batch_exporter(exporter, runtime::Tokio)
52+
.with_batch_exporter(exporter)
5353
.build())
5454
}
5555

opentelemetry-sdk/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ internal-logs = ["tracing"]
5656
experimental_metrics_periodic_reader_no_runtime = ["metrics"]
5757
experimental_metrics_periodicreader_with_async_runtime = ["metrics"]
5858
spec_unstable_metrics_views = ["metrics"]
59+
experimental_logs_batch_log_processor_with_async_runtime = ["logs"]
5960

6061
[[bench]]
6162
name = "context"

opentelemetry-sdk/src/logs/log_emitter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::{BatchLogProcessor, LogProcessor, LogRecord, SimpleLogProcessor, TraceContext};
2-
use crate::{export::logs::LogExporter, runtime::RuntimeChannel, Resource};
2+
use crate::{export::logs::LogExporter, Resource};
33
use crate::{logs::LogError, logs::LogResult};
44
use opentelemetry::{otel_debug, otel_info, trace::TraceContextExt, Context, InstrumentationScope};
55

@@ -194,7 +194,7 @@ impl Builder {
194194
}
195195

196196
/// The `LogExporter` setup using a default `BatchLogProcessor` that this provider should use.
197-
pub fn with_batch_exporter<T: LogExporter + 'static, R: RuntimeChannel>(
197+
pub fn with_batch_exporter<T: LogExporter + 'static>(
198198
self,
199199
exporter: T,
200200
) -> Self {

0 commit comments

Comments
 (0)