Skip to content

Commit fdc1151

Browse files
cijothomascijothomas
authored
Rename LoggerProvider, Logger to SdkLoggerProvider, SdkLogger (#2612)
1 parent 5bebbcc commit fdc1151

File tree

22 files changed

+123
-118
lines changed

22 files changed

+123
-118
lines changed

‎.cspell.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"datapoint",
3838
"deque",
3939
"Dirkjan",
40+
"Dwarnings",
4041
"EPYC",
4142
"flamegraph",
4243
"hasher",

‎examples/logs-basic/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use opentelemetry_appender_tracing::layer;
2-
use opentelemetry_sdk::logs::LoggerProvider;
2+
use opentelemetry_sdk::logs::SdkLoggerProvider;
33
use opentelemetry_sdk::Resource;
44
use tracing::error;
55
use tracing_subscriber::prelude::*;
66

77
fn main() {
88
let exporter = opentelemetry_stdout::LogExporter::default();
9-
let provider: LoggerProvider = LoggerProvider::builder()
9+
let provider: SdkLoggerProvider = SdkLoggerProvider::builder()
1010
.with_resource(
1111
Resource::builder()
1212
.with_service_name("log-appender-tracing-example")

‎opentelemetry-appender-log/examples/logs-basic.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
///
77
use log::{error, info, warn, Level};
88
use opentelemetry_appender_log::OpenTelemetryLogBridge;
9-
use opentelemetry_sdk::logs::{BatchLogProcessor, LoggerProvider};
9+
use opentelemetry_sdk::logs::{BatchLogProcessor, SdkLoggerProvider};
1010
use opentelemetry_stdout::LogExporter;
1111

1212
#[tokio::main]
1313
async fn main() {
1414
//Create an exporter that writes to stdout
1515
let exporter = LogExporter::default();
1616
//Create a LoggerProvider and register the exporter
17-
let logger_provider = LoggerProvider::builder()
17+
let logger_provider = SdkLoggerProvider::builder()
1818
.with_log_processor(BatchLogProcessor::builder(exporter).build())
1919
.build();
2020

‎opentelemetry-appender-log/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -771,15 +771,15 @@ mod tests {
771771
use super::OpenTelemetryLogBridge;
772772

773773
use opentelemetry::{logs::AnyValue, StringValue};
774-
use opentelemetry_sdk::{logs::InMemoryLogExporter, logs::LoggerProvider};
774+
use opentelemetry_sdk::{logs::InMemoryLogExporter, logs::SdkLoggerProvider};
775775

776776
use log::Log;
777777

778778
#[test]
779779
fn logbridge_with_default_metadata_is_enabled() {
780780
let exporter = InMemoryLogExporter::default();
781781

782-
let logger_provider = LoggerProvider::builder()
782+
let logger_provider = SdkLoggerProvider::builder()
783783
.with_simple_exporter(exporter)
784784
.build();
785785

@@ -798,7 +798,7 @@ mod tests {
798798
fn logbridge_with_record_can_log() {
799799
let exporter = InMemoryLogExporter::default();
800800

801-
let logger_provider = LoggerProvider::builder()
801+
let logger_provider = SdkLoggerProvider::builder()
802802
.with_simple_exporter(exporter.clone())
803803
.build();
804804

@@ -912,7 +912,7 @@ mod tests {
912912

913913
let exporter = InMemoryLogExporter::default();
914914

915-
let logger_provider = LoggerProvider::builder()
915+
let logger_provider = SdkLoggerProvider::builder()
916916
.with_simple_exporter(exporter.clone())
917917
.build();
918918

@@ -1178,7 +1178,7 @@ mod tests {
11781178

11791179
let exporter = InMemoryLogExporter::default();
11801180

1181-
let logger_provider = LoggerProvider::builder()
1181+
let logger_provider = SdkLoggerProvider::builder()
11821182
.with_simple_exporter(exporter.clone())
11831183
.build();
11841184

@@ -1221,7 +1221,7 @@ mod tests {
12211221
fn test_flush() {
12221222
let exporter = InMemoryLogExporter::default();
12231223

1224-
let logger_provider = LoggerProvider::builder()
1224+
let logger_provider = SdkLoggerProvider::builder()
12251225
.with_simple_exporter(exporter)
12261226
.build();
12271227

‎opentelemetry-appender-tracing/benches/logs.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use opentelemetry::InstrumentationScope;
1818
use opentelemetry_appender_tracing::layer as tracing_layer;
1919
use opentelemetry_sdk::logs::LogResult;
2020
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
21-
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LoggerProvider};
21+
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, SdkLoggerProvider};
2222
use opentelemetry_sdk::Resource;
2323
use pprof::criterion::{Output, PProfProfiler};
2424
use tracing::error;
@@ -127,7 +127,7 @@ fn benchmark_no_subscriber(c: &mut Criterion) {
127127
fn benchmark_with_ot_layer(c: &mut Criterion, enabled: bool, bench_name: &str) {
128128
let exporter = NoopExporter { enabled };
129129
let processor = NoopProcessor::new(exporter);
130-
let provider = LoggerProvider::builder()
130+
let provider = SdkLoggerProvider::builder()
131131
.with_resource(
132132
Resource::builder_empty()
133133
.with_service_name("benchmark")

‎opentelemetry-appender-tracing/examples/basic.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//! run with `$ cargo run --example basic
22
33
use opentelemetry_appender_tracing::layer;
4-
use opentelemetry_sdk::{logs::LoggerProvider, Resource};
4+
use opentelemetry_sdk::{logs::SdkLoggerProvider, Resource};
55
use tracing::error;
66
use tracing_subscriber::prelude::*;
77

88
fn main() {
99
let exporter = opentelemetry_stdout::LogExporter::default();
10-
let provider: LoggerProvider = LoggerProvider::builder()
10+
let provider: SdkLoggerProvider = SdkLoggerProvider::builder()
1111
.with_resource(
1212
Resource::builder()
1313
.with_service_name("log-appender-tracing-example")

‎opentelemetry-appender-tracing/src/layer.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ mod tests {
235235
use opentelemetry::{logs::AnyValue, Key};
236236
use opentelemetry_sdk::logs::InMemoryLogExporter;
237237
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
238-
use opentelemetry_sdk::logs::{LogRecord, LogResult, LoggerProvider};
238+
use opentelemetry_sdk::logs::{LogRecord, LogResult, SdkLoggerProvider};
239239
use opentelemetry_sdk::trace::{Sampler, TracerProvider};
240240
use tracing::{error, warn};
241241
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
@@ -250,7 +250,7 @@ mod tests {
250250

251251
fn create_tracing_subscriber(
252252
_exporter: InMemoryLogExporter,
253-
logger_provider: &LoggerProvider,
253+
logger_provider: &SdkLoggerProvider,
254254
) -> impl tracing::Subscriber {
255255
let level_filter = tracing_subscriber::filter::LevelFilter::WARN; // Capture WARN and ERROR levels
256256
let layer =
@@ -283,7 +283,7 @@ mod tests {
283283
#[ignore = "See issue: https://github.com/open-telemetry/opentelemetry-rust/issues/1745"]
284284
fn simple_processor_deadlock() {
285285
let exporter: ReentrantLogExporter = ReentrantLogExporter;
286-
let logger_provider = LoggerProvider::builder()
286+
let logger_provider = SdkLoggerProvider::builder()
287287
.with_simple_exporter(exporter.clone())
288288
.build();
289289

@@ -298,7 +298,7 @@ mod tests {
298298
#[ignore = "While this test runs fine, this uses global subscriber and does not play well with other tests."]
299299
fn simple_processor_no_deadlock() {
300300
let exporter: ReentrantLogExporter = ReentrantLogExporter;
301-
let logger_provider = LoggerProvider::builder()
301+
let logger_provider = SdkLoggerProvider::builder()
302302
.with_simple_exporter(exporter.clone())
303303
.build();
304304

@@ -319,7 +319,7 @@ mod tests {
319319
#[ignore = "While this test runs fine, this uses global subscriber and does not play well with other tests."]
320320
async fn batch_processor_no_deadlock() {
321321
let exporter: ReentrantLogExporter = ReentrantLogExporter;
322-
let logger_provider = LoggerProvider::builder()
322+
let logger_provider = SdkLoggerProvider::builder()
323323
.with_batch_exporter(exporter.clone())
324324
.build();
325325

@@ -333,7 +333,7 @@ mod tests {
333333
fn tracing_appender_standalone() {
334334
// Arrange
335335
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
336-
let logger_provider = LoggerProvider::builder()
336+
let logger_provider = SdkLoggerProvider::builder()
337337
.with_simple_exporter(exporter.clone())
338338
.build();
339339

@@ -413,7 +413,7 @@ mod tests {
413413
fn tracing_appender_inside_tracing_context() {
414414
// Arrange
415415
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
416-
let logger_provider = LoggerProvider::builder()
416+
let logger_provider = SdkLoggerProvider::builder()
417417
.with_simple_exporter(exporter.clone())
418418
.build();
419419

@@ -522,7 +522,7 @@ mod tests {
522522

523523
// Arrange
524524
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
525-
let logger_provider = LoggerProvider::builder()
525+
let logger_provider = SdkLoggerProvider::builder()
526526
.with_simple_exporter(exporter.clone())
527527
.build();
528528

@@ -580,7 +580,7 @@ mod tests {
580580
fn tracing_appender_standalone_with_tracing_log() {
581581
// Arrange
582582
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
583-
let logger_provider = LoggerProvider::builder()
583+
let logger_provider = SdkLoggerProvider::builder()
584584
.with_simple_exporter(exporter.clone())
585585
.build();
586586

@@ -645,7 +645,7 @@ mod tests {
645645
fn tracing_appender_inside_tracing_context_with_tracing_log() {
646646
// Arrange
647647
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
648-
let logger_provider = LoggerProvider::builder()
648+
let logger_provider = SdkLoggerProvider::builder()
649649
.with_simple_exporter(exporter.clone())
650650
.build();
651651

‎opentelemetry-otlp/examples/basic-otlp-http/src/main.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
99
use opentelemetry_otlp::WithExportConfig;
1010
use opentelemetry_otlp::{LogExporter, MetricExporter, Protocol, SpanExporter};
1111
use opentelemetry_sdk::{
12-
logs::LoggerProvider,
12+
logs::SdkLoggerProvider,
1313
metrics::{MetricError, SdkMeterProvider},
1414
trace::{self as sdktrace, TracerProvider},
1515
};
@@ -28,14 +28,14 @@ static RESOURCE: Lazy<Resource> = Lazy::new(|| {
2828
.build()
2929
});
3030

31-
fn init_logs() -> Result<sdklogs::LoggerProvider, opentelemetry_sdk::logs::LogError> {
31+
fn init_logs() -> Result<sdklogs::SdkLoggerProvider, opentelemetry_sdk::logs::LogError> {
3232
let exporter = LogExporter::builder()
3333
.with_http()
3434
.with_endpoint("http://localhost:4318/v1/logs")
3535
.with_protocol(Protocol::HttpBinary)
3636
.build()?;
3737

38-
Ok(LoggerProvider::builder()
38+
Ok(SdkLoggerProvider::builder()
3939
.with_batch_exporter(exporter)
4040
.with_resource(RESOURCE.clone())
4141
.build())

‎opentelemetry-otlp/examples/basic-otlp/src/main.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use opentelemetry::{global, InstrumentationScope};
55
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
66
use opentelemetry_otlp::{LogExporter, MetricExporter, SpanExporter, WithExportConfig};
77
use opentelemetry_sdk::logs::LogError;
8-
use opentelemetry_sdk::logs::LoggerProvider;
8+
use opentelemetry_sdk::logs::SdkLoggerProvider;
99
use opentelemetry_sdk::metrics::MetricError;
10-
use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
10+
use opentelemetry_sdk::metrics::SdkMeterProvider;
1111
use opentelemetry_sdk::{trace as sdktrace, Resource};
1212
use std::error::Error;
1313
use tracing::info;
@@ -40,13 +40,13 @@ fn init_metrics() -> Result<opentelemetry_sdk::metrics::SdkMeterProvider, Metric
4040
.build())
4141
}
4242

43-
fn init_logs() -> Result<opentelemetry_sdk::logs::LoggerProvider, LogError> {
43+
fn init_logs() -> Result<opentelemetry_sdk::logs::SdkLoggerProvider, LogError> {
4444
let exporter = LogExporter::builder()
4545
.with_tonic()
4646
.with_endpoint("http://localhost:4317")
4747
.build()?;
4848

49-
Ok(LoggerProvider::builder()
49+
Ok(SdkLoggerProvider::builder()
5050
.with_resource(RESOURCE.clone())
5151
.with_batch_exporter(exporter)
5252
.build())

‎opentelemetry-otlp/tests/integration_test/tests/logs.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use ctor::dtor;
55
use integration_test_runner::test_utils;
66
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
77
use opentelemetry_otlp::LogExporter;
8-
use opentelemetry_sdk::logs::LoggerProvider;
8+
use opentelemetry_sdk::logs::SdkLoggerProvider;
99
use opentelemetry_sdk::{logs as sdklogs, Resource};
1010
use std::fs::File;
1111
use std::io::Read;
@@ -14,7 +14,7 @@ use tracing::info;
1414
use tracing_subscriber::layer::SubscriberExt;
1515
use uuid::Uuid;
1616

17-
fn init_logs(is_simple: bool) -> Result<sdklogs::LoggerProvider> {
17+
fn init_logs(is_simple: bool) -> Result<sdklogs::SdkLoggerProvider> {
1818
let exporter_builder = LogExporter::builder();
1919
#[cfg(feature = "tonic-client")]
2020
let exporter_builder = exporter_builder.with_tonic();
@@ -28,7 +28,7 @@ fn init_logs(is_simple: bool) -> Result<sdklogs::LoggerProvider> {
2828

2929
let exporter = exporter_builder.build()?;
3030

31-
let mut logger_provider_builder = LoggerProvider::builder();
31+
let mut logger_provider_builder = SdkLoggerProvider::builder();
3232
if is_simple {
3333
logger_provider_builder = logger_provider_builder.with_simple_exporter(exporter)
3434
} else {

0 commit comments

Comments
 (0)