Skip to content

Commit c51fc68

Browse files
committed
fix test
1 parent 13f66a2 commit c51fc68

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

opentelemetry-sdk/src/logs/log_emitter.rs

+6-11
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl opentelemetry::logs::Logger for Logger {
266266

267267
/// Emit a `LogRecord`.
268268
fn emit(&self, mut record: Self::LogRecord) {
269-
let provider = self.provider();
269+
let provider = &self.provider;
270270
let processors = provider.log_processors();
271271

272272
//let mut log_record = record;
@@ -285,22 +285,17 @@ impl opentelemetry::logs::Logger for Logger {
285285
}
286286

287287
for p in processors {
288-
p.emit(&mut record, self.instrumentation_scope());
288+
p.emit(&mut record, &self.scope);
289289
}
290290
}
291291

292292
#[cfg(feature = "spec_unstable_logs_enabled")]
293293
fn event_enabled(&self, level: Severity, target: &str) -> bool {
294-
let provider = self.provider();
294+
let provider = &self.provider;
295295

296296
let mut enabled = false;
297297
for processor in provider.log_processors() {
298-
enabled = enabled
299-
|| processor.event_enabled(
300-
level,
301-
target,
302-
self.instrumentation_scope().name().as_ref(),
303-
);
298+
enabled = enabled || processor.event_enabled(level, target, self.scope.name().as_ref());
304299
}
305300
enabled
306301
}
@@ -733,14 +728,14 @@ mod tests {
733728
emitted_logs[0].clone().record.body,
734729
Some(AnyValue::String("Testing empty logger name".into()))
735730
);
736-
assert_eq!(logger.instrumentation_scope().name(), "");
731+
assert_eq!(logger.scope.name(), "");
737732

738733
// Assert the second log created through the scope
739734
assert_eq!(
740735
emitted_logs[1].clone().record.body,
741736
Some(AnyValue::String("Testing empty logger scope name".into()))
742737
);
743-
assert_eq!(scoped_logger.instrumentation_scope().name(), "");
738+
assert_eq!(scoped_logger.scope.name(), "");
744739
}
745740

746741
#[derive(Debug)]

opentelemetry-sdk/src/logs/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ mod tests {
108108
}
109109

110110
#[test]
111+
#[allow(deprecated)]
111112
fn logger_attributes() {
112113
let provider = LoggerProvider::builder().build();
113114
let scope = InstrumentationScope::builder("test_logger")

0 commit comments

Comments
 (0)