Skip to content

Commit 72de6a4

Browse files
committed
fmt
1 parent 3399573 commit 72de6a4

File tree

5 files changed

+23
-12
lines changed

5 files changed

+23
-12
lines changed

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ impl LogExporter for OtlpHttpClient {
2020
})?;
2121

2222
//TBD :avoid cloning and work only on borrowed logdata
23-
let owned_batch = batch.into_iter()
24-
.map(|cow_log_data| cow_log_data.into_owned()) // Converts Cow to owned LogData
23+
let owned_batch = batch
24+
.into_iter()
25+
.map(|cow_log_data| cow_log_data.into_owned()) // Converts Cow to owned LogData
2526
.collect::<Vec<LogData>>();
2627

2728
let (body, content_type) = { self.build_logs_export_body(owned_batch, &self.resource)? };

opentelemetry-otlp/src/logs.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ impl LogExporter {
9898

9999
#[async_trait]
100100
impl opentelemetry_sdk::export::logs::LogExporter for LogExporter {
101-
async fn export<'a>(&mut self, batch: Vec<std::borrow::Cow<'a, LogData>>) -> opentelemetry::logs::LogResult<()> {
101+
async fn export<'a>(
102+
&mut self,
103+
batch: Vec<std::borrow::Cow<'a, LogData>>,
104+
) -> opentelemetry::logs::LogResult<()> {
102105
self.client.export(batch).await
103106
}
104107

opentelemetry-sdk/src/export/logs/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use opentelemetry::{
88
logs::{LogError, LogResult},
99
InstrumentationLibrary,
1010
};
11-
use std::fmt::Debug;
1211
use std::borrow::Cow;
12+
use std::fmt::Debug;
1313

1414
/// `LogExporter` defines the interface that log exporters should implement.
1515
#[async_trait]

opentelemetry-sdk/src/logs/log_processor.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use opentelemetry::{
1414
global,
1515
logs::{LogError, LogResult},
1616
};
17+
use std::borrow::Cow;
1718
use std::sync::atomic::AtomicBool;
1819
use std::{cmp::min, env, sync::Mutex};
1920
use std::{
@@ -22,7 +23,6 @@ use std::{
2223
sync::Arc,
2324
time::Duration,
2425
};
25-
use std::borrow::Cow;
2626

2727
/// Delay interval between two consecutive exports.
2828
const OTEL_BLRP_SCHEDULE_DELAY: &str = "OTEL_BLRP_SCHEDULE_DELAY";
@@ -91,7 +91,9 @@ impl LogProcessor for SimpleLogProcessor {
9191
.exporter
9292
.lock()
9393
.map_err(|_| LogError::Other("simple logprocessor mutex poison".into()))
94-
.and_then(|mut exporter| futures_executor::block_on(exporter.export(vec![Cow::Borrowed(data)])));
94+
.and_then(|mut exporter| {
95+
futures_executor::block_on(exporter.export(vec![Cow::Borrowed(data)]))
96+
});
9597
if let Err(err) = result {
9698
global::handle_error(err);
9799
}
@@ -142,7 +144,9 @@ impl<R: RuntimeChannel> Debug for BatchLogProcessor<R> {
142144

143145
impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {
144146
fn emit(&self, data: &mut LogData) {
145-
let result = self.message_sender.try_send(BatchMessage::ExportLog(data.clone()));
147+
let result = self
148+
.message_sender
149+
.try_send(BatchMessage::ExportLog(data.clone()));
146150

147151
if let Err(err) = result {
148152
global::handle_error(LogError::Other(err.into()));
@@ -497,7 +501,6 @@ mod tests {
497501
OTEL_BLRP_MAX_QUEUE_SIZE, OTEL_BLRP_SCHEDULE_DELAY,
498502
};
499503
use crate::testing::logs::InMemoryLogsExporterBuilder;
500-
use std::borrow::Cow;
501504
use crate::{
502505
export::logs::{LogData, LogExporter},
503506
logs::{
@@ -514,6 +517,7 @@ mod tests {
514517
};
515518
use async_trait::async_trait;
516519
use opentelemetry::{logs::LogResult, KeyValue};
520+
use std::borrow::Cow;
517521
use std::sync::Arc;
518522
use std::time::Duration;
519523

@@ -524,7 +528,7 @@ mod tests {
524528

525529
#[async_trait]
526530
impl LogExporter for MockLogExporter {
527-
async fn export<'a>(&mut self, _batch: Vec<Cow<'a, LogData>>) -> LogResult<()> {
531+
async fn export<'a>(&mut self, _batch: Vec<Cow<'a, LogData>>) -> LogResult<()> {
528532
Ok(())
529533
}
530534

@@ -765,7 +769,7 @@ mod tests {
765769
.build();
766770
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
767771

768-
let mut log_data = LogData{
772+
let mut log_data = LogData {
769773
record: Default::default(),
770774
instrumentation: Default::default(),
771775
};

opentelemetry-stdout/src/logs/exporter.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use opentelemetry::{
66
};
77
use opentelemetry_sdk::export::logs::{ExportResult, LogData};
88
use opentelemetry_sdk::Resource;
9-
use std::io::{stdout, Write};
109
use std::borrow::Cow;
10+
use std::io::{stdout, Write};
1111

1212
type Encoder =
1313
Box<dyn Fn(&mut dyn Write, crate::logs::transform::LogData) -> LogResult<()> + Send + Sync>;
@@ -47,7 +47,10 @@ impl opentelemetry_sdk::export::logs::LogExporter for LogExporter {
4747
/// Export spans to stdout
4848
async fn export<'a>(&mut self, batch: Vec<Cow<'a, LogData>>) -> ExportResult {
4949
if let Some(writer) = &mut self.writer {
50-
let log_data = crate::logs::transform::LogData::from((batch.into_iter().map(Cow::into_owned).collect(), &self.resource));
50+
let log_data = crate::logs::transform::LogData::from((
51+
batch.into_iter().map(Cow::into_owned).collect(),
52+
&self.resource,
53+
));
5154
let result = (self.encoder)(writer, log_data) as LogResult<()>;
5255
result.and_then(|_| writer.write_all(b"\n").map_err(|e| Error(e).into()))
5356
} else {

0 commit comments

Comments
 (0)