Skip to content
Merged
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
5 changes: 0 additions & 5 deletions opentelemetry-sdk/src/logs/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ impl SdkLogger {
pub(crate) fn new(scope: InstrumentationScope, provider: SdkLoggerProvider) -> Self {
SdkLogger { scope, provider }
}

#[cfg(test)]
pub(crate) fn instrumentation_scope(&self) -> &InstrumentationScope {
&self.scope
}
}

impl opentelemetry::logs::Logger for SdkLogger {
Expand Down
12 changes: 7 additions & 5 deletions opentelemetry-sdk/src/logs/logger_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -700,21 +700,23 @@ mod tests {
scoped_logger.emit(scoped_record);

// Assert: Verify that the emitted logs are processed correctly
let emitted_logs = exporter.get_emitted_logs().unwrap();
let mut emitted_logs = exporter.get_emitted_logs().unwrap();
assert_eq!(emitted_logs.len(), 2);
let log1 = emitted_logs.remove(0);
// Assert the first log
assert_eq!(
emitted_logs[0].clone().record.body,
log1.record.body,
Some(AnyValue::String("Testing empty logger name".into()))
);
assert_eq!(logger.instrumentation_scope().name(), "");
assert_eq!(log1.instrumentation.name(), "");

// Assert the second log created through the scope
let log2 = emitted_logs.remove(0);
assert_eq!(
emitted_logs[1].clone().record.body,
log2.record.body,
Some(AnyValue::String("Testing empty logger scope name".into()))
);
assert_eq!(scoped_logger.instrumentation_scope().name(), "");
assert_eq!(log1.instrumentation.name(), "");
}

#[test]
Expand Down
22 changes: 19 additions & 3 deletions opentelemetry-sdk/src/logs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,32 @@ mod tests {
}

#[test]
#[allow(deprecated)]
fn logger_attributes() {
let provider = SdkLoggerProvider::builder().build();
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
let provider = SdkLoggerProvider::builder()
.with_log_processor(SimpleLogProcessor::new(exporter.clone()))
.build();

let scope = InstrumentationScope::builder("test_logger")
.with_schema_url("https://opentelemetry.io/schema/1.0.0")
.with_attributes(vec![(KeyValue::new("test_k", "test_v"))])
.build();

let logger = provider.logger_with_scope(scope);
let instrumentation_scope = logger.instrumentation_scope();

let mut log_record = logger.create_log_record();
log_record.set_severity_number(Severity::Error);

logger.emit(log_record);

let mut exported_logs = exporter
.get_emitted_logs()
.expect("Logs are expected to be exported.");
assert_eq!(exported_logs.len(), 1);
let log = exported_logs.remove(0);
assert_eq!(log.record.severity_number, Some(Severity::Error));

let instrumentation_scope = log.instrumentation;
assert_eq!(instrumentation_scope.name(), "test_logger");
assert_eq!(
instrumentation_scope.schema_url(),
Expand Down