Skip to content

Commit 95627b9

Browse files
committed
fix http. tonic to use tokio mutex without import
1 parent 7d45709 commit 95627b9

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

opentelemetry-otlp/src/exporter/http/logs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl LogExporter for OtlpHttpClient {
4646
Ok(())
4747
}
4848

49-
fn shutdown(&mut self) -> OTelSdkResult {
49+
fn shutdown(&self) -> OTelSdkResult {
5050
let mut client_guard = self.client.lock().map_err(|e| {
5151
OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {}", e))
5252
})?;

opentelemetry-otlp/src/exporter/tonic/logs.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Chann
1010
use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scope;
1111

1212
use super::BoxInterceptor;
13-
use tokio::sync::Mutex;
1413

1514
pub(crate) struct TonicLogsClient {
1615
inner: Option<ClientInner>,
@@ -21,7 +20,7 @@ pub(crate) struct TonicLogsClient {
2120

2221
struct ClientInner {
2322
client: LogsServiceClient<Channel>,
24-
interceptor: Mutex<BoxInterceptor>,
23+
interceptor: tokio::sync::Mutex<BoxInterceptor>,
2524
}
2625

2726
impl fmt::Debug for TonicLogsClient {
@@ -48,7 +47,7 @@ impl TonicLogsClient {
4847
TonicLogsClient {
4948
inner: Some(ClientInner {
5049
client,
51-
interceptor: Mutex::new(interceptor),
50+
interceptor: tokio::sync::Mutex::new(interceptor),
5251
}),
5352
resource: Default::default(),
5453
}

0 commit comments

Comments
 (0)