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.

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

chore(query): add timeout for open telemetry logger #15627

Merged
merged 1 commit into from
May 23, 2024
Merged
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
57 changes: 56 additions & 1 deletion src/common/tracing/src/loggers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,22 @@ use std::fmt;
use std::io::BufWriter;
use std::path::Path;
use std::sync::Arc;
use std::sync::Mutex;
use std::time::Duration;
use std::time::SystemTime;

use databend_common_base::runtime::ThreadTracker;
use fern::FormatCallback;
use opentelemetry::global;
use opentelemetry::logs::AnyValue;
use opentelemetry::logs::LogError;
use opentelemetry::logs::LogResult;
use opentelemetry::logs::Severity;
use opentelemetry::InstrumentationLibrary;
use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::export::logs::LogData;
use opentelemetry_sdk::export::logs::LogExporter;
use opentelemetry_sdk::logs::LogProcessor;
use serde_json::Map;
use tracing_appender::non_blocking::NonBlocking;
use tracing_appender::non_blocking::WorkerGuard;
Expand Down Expand Up @@ -89,6 +96,54 @@ pub(crate) struct OpenTelemetryLogger {
provider: opentelemetry_sdk::logs::LoggerProvider,
}

#[derive(Debug)]
struct LogProcessorWarp<T: LogExporter>(Mutex<Box<T>>);

impl<T: LogExporter> LogProcessor for LogProcessorWarp<T> {
fn emit(&self, data: LogData) {
match self.0.lock() {
Ok(mut exporter) => {
let err = databend_common_base::runtime::block_on(
databend_common_base::base::tokio::time::timeout(
Duration::from_secs(20),
exporter.export(vec![data]),
),
);

match err {
Ok(Ok(_)) => {
// do nothing
}
Ok(Err(err)) => {
global::handle_error(err);
}
Err(_) => {
global::handle_error(LogError::Other("timeout with lock".into()));
}
}
}
Err(_) => {
global::handle_error(LogError::Other("simple logprocessor mutex poison".into()));
}
}
}

fn force_flush(&self) -> LogResult<()> {
Ok(())
}

fn shutdown(&mut self) -> LogResult<()> {
if let Ok(mut exporter) = self.0.lock() {
exporter.shutdown();
Ok(())
} else {
Err(LogError::Other(
"simple logprocessor mutex poison during shutdown".into(),
))
}
}
}

impl OpenTelemetryLogger {
pub(crate) fn new(
name: impl ToString,
Expand All @@ -113,7 +168,7 @@ impl OpenTelemetryLogger {
.build_log_exporter()
.expect("build log exporter");
let provider = opentelemetry_sdk::logs::LoggerProvider::builder()
.with_simple_exporter(exporter)
.with_log_processor(LogProcessorWarp(Mutex::new(Box::new(exporter))))
.with_config(
opentelemetry_sdk::logs::Config::default()
.with_resource(opentelemetry_sdk::Resource::new(kvs)),
Expand Down
Loading