Skip to content

[Logs] Initial draft to handle batch export into background thread #2096

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.

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion opentelemetry-appender-log/examples/logs-basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async fn main() {
let exporter = LogExporter::default();
//Create a LoggerProvider and register the exporter
let logger_provider = LoggerProvider::builder()
.with_log_processor(BatchLogProcessor::builder(exporter, runtime::Tokio).build())
.with_log_processor(BatchLogProcessor::builder(exporter).build())
.build();

// Setup Log Appender for the log crate.
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-appender-tracing/src/layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ mod tests {
async fn batch_processor_no_deadlock() {
let exporter: ReentrantLogExporter = ReentrantLogExporter;
let logger_provider = LoggerProvider::builder()
.with_batch_exporter(exporter.clone(), opentelemetry_sdk::runtime::Tokio)
.with_batch_exporter(exporter.clone())
.build();

let layer = layer::OpenTelemetryTracingBridge::new(&logger_provider);
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-otlp/examples/basic-otlp/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn init_logs() -> Result<opentelemetry_sdk::logs::LoggerProvider, LogError> {

Ok(LoggerProvider::builder()
.with_resource(RESOURCE.clone())
.with_batch_exporter(exporter, runtime::Tokio)
.with_batch_exporter(exporter)
.build())
}

Expand Down
4 changes: 3 additions & 1 deletion opentelemetry-otlp/src/logs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ use async_trait::async_trait;
use opentelemetry::otel_debug;
use std::fmt::Debug;

use opentelemetry::logs::LogError;
use opentelemetry_sdk::logs::LogResult;
use opentelemetry_sdk::Resource;

use opentelemetry_sdk::export::logs::LogBatch;

Expand Down Expand Up @@ -134,4 +136,4 @@ impl opentelemetry_sdk::export::logs::LogExporter for LogExporter {
fn set_resource(&mut self, resource: &opentelemetry_sdk::Resource) {
self.client.set_resource(resource);
}
}
}
2 changes: 1 addition & 1 deletion opentelemetry-otlp/tests/integration_test/tests/logs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use opentelemetry::KeyValue;
use opentelemetry_appender_log::OpenTelemetryLogBridge;
use opentelemetry_otlp::LogExporter;
use opentelemetry_sdk::logs::{LogError, LoggerProvider};
use opentelemetry_sdk::{logs as sdklogs, runtime, Resource};
use opentelemetry_sdk::{logs as sdklogs, Resource};
use std::error::Error;
use std::fs::File;
use std::os::unix::fs::MetadataExt;
Expand Down
7 changes: 3 additions & 4 deletions opentelemetry-sdk/src/logs/log_emitter.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use super::{BatchLogProcessor, LogProcessor, LogRecord, SimpleLogProcessor, TraceContext};
use crate::{export::logs::LogExporter, runtime::RuntimeChannel, Resource};
use crate::{export::logs::LogExporter, Resource};
use crate::{logs::LogError, logs::LogResult};
use opentelemetry::{otel_debug, otel_info, trace::TraceContextExt, Context, InstrumentationScope};

Expand Down Expand Up @@ -194,12 +194,11 @@ impl Builder {
}

/// The `LogExporter` setup using a default `BatchLogProcessor` that this provider should use.
pub fn with_batch_exporter<T: LogExporter + 'static, R: RuntimeChannel>(
pub fn with_batch_exporter<T: LogExporter + 'static>(
self,
exporter: T,
runtime: R,
) -> Self {
let batch = BatchLogProcessor::builder(exporter, runtime).build();
let batch = BatchLogProcessor::builder(exporter).build();
self.with_log_processor(batch)
}

Expand Down
Loading
Loading