Rename TracerProvider to SdkTracerProvider

README.md

@@ -68,9 +68,9 @@ Project versioning information and stability guarantees can be found
 use opentelemetry::trace::{
     TraceContextExt,
     Tracer,
-    TracerProvider as _,
+    TracerProvider,
 };
-use opentelemetry_sdk::trace::TracerProvider;
+use opentelemetry_sdk::trace::SdkTracerProvider;
 
 fn main() {
     // Create a new trace pipeline that prints to stdout

examples/tracing-grpc/src/client.rs

@@ -9,10 +9,10 @@ use opentelemetry::{
     Context, KeyValue,
 };
 
-fn init_tracer() -> sdktrace::TracerProvider {
+fn init_tracer() -> sdktrace::SdkTracerProvider {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
-    let provider = sdktrace::TracerProvider::builder()
+    let provider = sdktrace::SdkTracerProvider::builder()
         .with_batch_exporter(SpanExporter::default())
         .build();
 

examples/tracing-grpc/src/server.rs

@@ -5,14 +5,14 @@ use opentelemetry::{
     propagation::Extractor,
     trace::{Span, SpanKind, Tracer},
 };
-use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::TracerProvider};
+use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::SdkTracerProvider};
 use opentelemetry_stdout::SpanExporter;
 use tonic::{transport::Server, Request, Response, Status};
 
-fn init_tracer() -> TracerProvider {
+fn init_tracer() -> SdkTracerProvider {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
-    let provider = TracerProvider::builder()
+    let provider = SdkTracerProvider::builder()
         .with_batch_exporter(SpanExporter::default())
         .build();
 

examples/tracing-http-propagator/src/client.rs

@@ -6,14 +6,14 @@ use opentelemetry::{
     Context, KeyValue,
 };
 use opentelemetry_http::{Bytes, HeaderInjector};
-use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::TracerProvider};
+use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::SdkTracerProvider};
 use opentelemetry_stdout::SpanExporter;
 
 fn init_tracer() {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
     // For the demonstration, use `Sampler::AlwaysOn` sampler to sample all traces.
-    let provider = TracerProvider::builder()
+    let provider = SdkTracerProvider::builder()
         .with_simple_exporter(SpanExporter::default())
         .build();
 

examples/tracing-http-propagator/src/server.rs

@@ -7,7 +7,7 @@ use opentelemetry::{
     Context, KeyValue,
 };
 use opentelemetry_http::{Bytes, HeaderExtractor};
-use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::TracerProvider};
+use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::SdkTracerProvider};
 use opentelemetry_semantic_conventions::trace;
 use opentelemetry_stdout::SpanExporter;
 use std::{convert::Infallible, net::SocketAddr};
@@ -93,7 +93,7 @@ fn init_tracer() {
 
     // Setup tracerprovider with stdout exporter
     // that prints the spans to stdout.
-    let provider = TracerProvider::builder()
+    let provider = SdkTracerProvider::builder()
         .with_simple_exporter(SpanExporter::default())
         .build();
 

examples/tracing-jaeger/src/main.rs

@@ -3,17 +3,17 @@ use opentelemetry::{
     trace::{TraceContextExt, TraceError, Tracer},
     KeyValue,
 };
-use opentelemetry_sdk::trace::TracerProvider;
+use opentelemetry_sdk::trace::SdkTracerProvider;
 use opentelemetry_sdk::Resource;
 
 use std::error::Error;
 
-fn init_tracer_provider() -> Result<opentelemetry_sdk::trace::TracerProvider, TraceError> {
+fn init_tracer_provider() -> Result<opentelemetry_sdk::trace::SdkTracerProvider, TraceError> {
     let exporter = opentelemetry_otlp::SpanExporter::builder()
         .with_tonic()
         .build()?;
 
-    Ok(TracerProvider::builder()
+    Ok(SdkTracerProvider::builder()
         .with_batch_exporter(exporter)
         .with_resource(
             Resource::builder()

opentelemetry-appender-tracing/src/layer.rs

@@ -230,13 +230,13 @@ const fn severity_of_level(level: &Level) -> Severity {
 mod tests {
     use crate::layer;
     use opentelemetry::logs::Severity;
-    use opentelemetry::trace::TracerProvider as _;
+    use opentelemetry::trace::TracerProvider;
     use opentelemetry::trace::{TraceContextExt, TraceFlags, Tracer};
     use opentelemetry::{logs::AnyValue, Key};
     use opentelemetry_sdk::logs::InMemoryLogExporter;
     use opentelemetry_sdk::logs::{LogBatch, LogExporter};
     use opentelemetry_sdk::logs::{LogRecord, LogResult, SdkLoggerProvider};
-    use opentelemetry_sdk::trace::{Sampler, TracerProvider};
+    use opentelemetry_sdk::trace::{Sampler, SdkTracerProvider};
     use tracing::{error, warn};
     use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
     use tracing_subscriber::util::SubscriberInitExt;
@@ -424,7 +424,7 @@ mod tests {
         let _guard = tracing::subscriber::set_default(subscriber);
 
         // setup tracing as well.
-        let tracer_provider = TracerProvider::builder()
+        let tracer_provider = SdkTracerProvider::builder()
             .with_sampler(Sampler::AlwaysOn)
             .build();
         let tracer = tracer_provider.tracer("test-tracer");
@@ -528,7 +528,7 @@ mod tests {
 
         // setup tracing layer to compare trace/span IDs against
         let span_exporter = InMemorySpanExporterBuilder::new().build();
-        let tracer_provider = TracerProvider::builder()
+        let tracer_provider = SdkTracerProvider::builder()
             .with_simple_exporter(span_exporter.clone())
             .build();
         let tracer = tracer_provider.tracer("test-tracer");
@@ -657,7 +657,7 @@ mod tests {
         drop(tracing_log::LogTracer::init());
 
         // setup tracing as well.
-        let tracer_provider = TracerProvider::builder()
+        let tracer_provider = SdkTracerProvider::builder()
             .with_sampler(Sampler::AlwaysOn)
             .build();
         let tracer = tracer_provider.tracer("test-tracer");

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

@@ -11,7 +11,7 @@ use opentelemetry_otlp::{LogExporter, MetricExporter, Protocol, SpanExporter};
 use opentelemetry_sdk::{
     logs::SdkLoggerProvider,
     metrics::{MetricError, SdkMeterProvider},
-    trace::{self as sdktrace, TracerProvider},
+    trace::{self as sdktrace, SdkTracerProvider},
 };
 use opentelemetry_sdk::{
     logs::{self as sdklogs},
@@ -41,14 +41,14 @@ fn init_logs() -> Result<sdklogs::SdkLoggerProvider, opentelemetry_sdk::logs::Lo
         .build())
 }
 
-fn init_traces() -> Result<sdktrace::TracerProvider, TraceError> {
+fn init_traces() -> Result<sdktrace::SdkTracerProvider, TraceError> {
     let exporter = SpanExporter::builder()
         .with_http()
         .with_protocol(Protocol::HttpBinary) //can be changed to `Protocol::HttpJson` to export in JSON format
         .with_endpoint("http://localhost:4318/v1/traces")
         .build()?;
 
-    Ok(TracerProvider::builder()
+    Ok(SdkTracerProvider::builder()
         .with_batch_exporter(exporter)
         .with_resource(RESOURCE.clone())
         .build())

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

@@ -20,12 +20,12 @@ static RESOURCE: Lazy<Resource> = Lazy::new(|| {
         .build()
 });
 
-fn init_traces() -> Result<sdktrace::TracerProvider, TraceError> {
+fn init_traces() -> Result<sdktrace::SdkTracerProvider, TraceError> {
     let exporter = SpanExporter::builder()
         .with_tonic()
         .with_endpoint("http://localhost:4317")
         .build()?;
-    Ok(sdktrace::TracerProvider::builder()
+    Ok(sdktrace::SdkTracerProvider::builder()
         .with_resource(RESOURCE.clone())
         .with_batch_exporter(exporter)
         .build())

opentelemetry-otlp/src/lib.rs

@@ -39,7 +39,7 @@
 //!     // First, create a OTLP exporter builder. Configure it as you need.
 //!     let otlp_exporter = opentelemetry_otlp::SpanExporter::builder().with_tonic().build()?;
 //!     // Then pass it into provider builder
-//!     let _ = opentelemetry_sdk::trace::TracerProvider::builder()
+//!     let _ = opentelemetry_sdk::trace::SdkTracerProvider::builder()
 //!         .with_simple_exporter(otlp_exporter)
 //!         .build();
 //!     let tracer = global::tracer("my_tracer");
@@ -73,7 +73,7 @@
 //!     // First, create a OTLP exporter builder. Configure it as you need.
 //!     let otlp_exporter = opentelemetry_otlp::SpanExporter::builder().with_tonic().build()?;
 //!     // Then pass it into provider builder
-//!     let _ = opentelemetry_sdk::trace::TracerProvider::builder()
+//!     let _ = opentelemetry_sdk::trace::SdkTracerProvider::builder()
 //!         .with_batch_exporter(otlp_exporter)
 //!         .build();
 //!     let tracer = global::tracer("my_tracer");
@@ -123,7 +123,7 @@
 //! Generally there are two parts of configuration. One is the exporter, the other is the provider.
 //! Users can configure the exporter using [SpanExporter::builder()] for traces,
 //! and [MetricExporter::builder()] + [opentelemetry_sdk::metrics::PeriodicReader::builder()] for metrics.
-//! Once you have an exporter, you can add it to either a [opentelemetry_sdk::trace::TracerProvider::builder()] for traces,
+//! Once you have an exporter, you can add it to either a [opentelemetry_sdk::trace::SdkTracerProvider::builder()] for traces,
 //! or [opentelemetry_sdk::metrics::SdkMeterProvider::builder()] for metrics.
 //!
 //! ```no_run
@@ -151,7 +151,7 @@
 //!         .with_metadata(map)
 //!         .build()?;
 //!
-//!     let tracer_provider = opentelemetry_sdk::trace::TracerProvider::builder()
+//!     let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
 //!         .with_batch_exporter(exporter)
 //!         .with_config(
 //!             trace::Config::default()

opentelemetry-otlp/tests/integration_test/tests/traces.rs

@@ -20,7 +20,7 @@ use std::os::unix::fs::MetadataExt;
 use std::time::Duration;
 use tokio::time::sleep;
 
-fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
+fn init_tracer_provider() -> Result<sdktrace::SdkTracerProvider, TraceError> {
     let exporter_builder = SpanExporter::builder();
     #[cfg(feature = "tonic-client")]
     let exporter_builder = exporter_builder.with_tonic();
@@ -34,7 +34,7 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
 
     let exporter = exporter_builder.build()?;
 
-    Ok(opentelemetry_sdk::trace::TracerProvider::builder()
+    Ok(opentelemetry_sdk::trace::SdkTracerProvider::builder()
         .with_batch_exporter(exporter)
         .with_resource(
             Resource::builder_empty()

opentelemetry-otlp/tests/smoke.rs

@@ -83,7 +83,7 @@ async fn smoke_tracer() {
         println!("Installing tracer provider...");
         let mut metadata = tonic::metadata::MetadataMap::new();
         metadata.insert("x-header-key", "header-value".parse().unwrap());
-        let tracer_provider = opentelemetry_sdk::trace::TracerProvider::builder()
+        let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
             .with_batch_exporter(
                 #[cfg(feature = "gzip-tonic")]
                 opentelemetry_otlp::SpanExporter::builder()

opentelemetry-sdk/CHANGELOG.md

@@ -295,7 +295,7 @@ limit.
   `Logger::create_log_record()` method.
 
 - Rename `opentelemetry_sdk::logs::Builder` to `opentelemetry_sdk::logs::LoggerProviderBuilder`.
-- Rename `opentelemetry_sdk::trace::Builder` to  `opentelemetry_sdk::trace::TracerProviderBuilder`.
+- Rename `opentelemetry_sdk::trace::Builder` to  `opentelemetry_sdk::trace::SdkTracerProviderBuilder`.
 
 - *Breaking*: Rename namespaces for InMemoryExporters. (The module is still under "testing" feature flag)
   before:
@@ -377,6 +377,11 @@ let processor = BatchSpanProcessor::builder(exporter)
   `SdkLogger` respectively to avoid name collision with public API types.
   [#2612](https://github.com/open-telemetry/opentelemetry-rust/pull/2612)
 
+- **Breaking** Renamed `TracerProvider` and `Tracer` to `SdkTracerProvider` and
+  `SdkTracer` to avoid name collision with public API types. `Tracer` is still
+  type-aliased to `SdkTracer` to keep back-compat with tracing-opentelemetry.
+  [#2614](https://github.com/open-telemetry/opentelemetry-rust/pull/2614)
+
 ## 0.27.1
 
 Released 2024-Nov-27

opentelemetry-sdk/Cargo.toml

@@ -42,7 +42,7 @@ temp-env = { workspace = true }
 pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
 
 [features]
-default = ["trace", "metrics", "logs", "internal-logs"]
+default = ["trace", "metrics", "logs", "internal-logs", "experimental_trace_batch_span_processor_with_async_runtime", "experimental_async_runtime"]
 trace = ["opentelemetry/trace", "rand", "percent-encoding"]
 jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url"]
 logs = ["opentelemetry/logs", "serde_json"]

opentelemetry-sdk/benches/context.rs

@@ -4,13 +4,13 @@ use opentelemetry::{
     global::BoxedTracer,
     trace::{
         noop::NoopTracer, SpanContext, SpanId, TraceContextExt, TraceFlags, TraceId, TraceState,
-        TracerProvider as _,
+        TracerProvider,
     },
     Context, ContextGuard,
 };
 use opentelemetry_sdk::{
     trace::{ExportResult, SpanData, SpanExporter},
-    trace::{Sampler, TracerProvider},
+    trace::{Sampler, SdkTracerProvider},
 };
 #[cfg(not(target_os = "windows"))]
 use pprof::criterion::{Output, PProfProfiler};
@@ -94,7 +94,7 @@ impl Environment {
         }
     }
 
-    fn setup(&self) -> (Option<TracerProvider>, BoxedTracer, Option<ContextGuard>) {
+    fn setup(&self) -> (Option<SdkTracerProvider>, BoxedTracer, Option<ContextGuard>) {
         match self {
             Environment::InContext => {
                 let guard = Context::current()
@@ -124,8 +124,8 @@ impl Display for Environment {
     }
 }
 
-fn parent_sampled_tracer(inner_sampler: Sampler) -> (TracerProvider, BoxedTracer) {
-    let provider = TracerProvider::builder()
+fn parent_sampled_tracer(inner_sampler: Sampler) -> (SdkTracerProvider, BoxedTracer) {
+    let provider = SdkTracerProvider::builder()
         .with_sampler(Sampler::ParentBased(Box::new(inner_sampler)))
         .with_simple_exporter(NoopExporter)
         .build();

opentelemetry-sdk/benches/log.rs

@@ -22,10 +22,10 @@ use criterion::{criterion_group, criterion_main, Criterion};
 
 use opentelemetry::logs::{AnyValue, LogRecord as _, Logger, LoggerProvider, Severity};
 use opentelemetry::trace::Tracer;
-use opentelemetry::trace::TracerProvider as _;
+use opentelemetry::trace::TracerProvider;
 use opentelemetry::{InstrumentationScope, Key};
 use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, SdkLogger, SdkLoggerProvider};
-use opentelemetry_sdk::trace::{Sampler, TracerProvider};
+use opentelemetry_sdk::trace::{Sampler, SdkTracerProvider};
 
 #[derive(Debug)]
 struct NoopProcessor;
@@ -63,7 +63,7 @@ fn log_benchmark_group<F: Fn(&SdkLogger)>(c: &mut Criterion, name: &str, f: F) {
         let logger = provider.logger("with-context");
 
         // setup tracing as well.
-        let tracer_provider = TracerProvider::builder()
+        let tracer_provider = SdkTracerProvider::builder()
             .with_sampler(Sampler::AlwaysOn)
             .build();
         let tracer = tracer_provider.tracer("bench-tracer");

opentelemetry-sdk/benches/span_builder.rs

@@ -52,8 +52,8 @@ fn span_builder_benchmark_group(c: &mut Criterion) {
     group.finish();
 }
 
-fn not_sampled_provider() -> (sdktrace::TracerProvider, sdktrace::Tracer) {
-    let provider = sdktrace::TracerProvider::builder()
+fn not_sampled_provider() -> (sdktrace::SdkTracerProvider, sdktrace::SdkTracer) {
+    let provider = sdktrace::SdkTracerProvider::builder()
         .with_sampler(sdktrace::Sampler::AlwaysOff)
         .with_simple_exporter(NoopExporter)
         .build();

opentelemetry-sdk/benches/trace.rs

@@ -65,11 +65,11 @@ impl SpanExporter for VoidExporter {
     }
 }
 
-fn trace_benchmark_group<F: Fn(&sdktrace::Tracer)>(c: &mut Criterion, name: &str, f: F) {
+fn trace_benchmark_group<F: Fn(&sdktrace::SdkTracer)>(c: &mut Criterion, name: &str, f: F) {
     let mut group = c.benchmark_group(name);
 
     group.bench_function("always-sample", |b| {
-        let provider = sdktrace::TracerProvider::builder()
+        let provider = sdktrace::SdkTracerProvider::builder()
             .with_sampler(sdktrace::Sampler::AlwaysOn)
             .with_simple_exporter(VoidExporter)
             .build();
@@ -79,7 +79,7 @@ fn trace_benchmark_group<F: Fn(&sdktrace::Tracer)>(c: &mut Criterion, name: &str
     });
 
     group.bench_function("never-sample", |b| {
-        let provider = sdktrace::TracerProvider::builder()
+        let provider = sdktrace::SdkTracerProvider::builder()
             .with_sampler(sdktrace::Sampler::AlwaysOff)
             .with_simple_exporter(VoidExporter)
             .build();

opentelemetry-sdk/src/lib.rs

@@ -11,8 +11,8 @@
 //! ```no_run
 //! # #[cfg(feature = "trace")]
 //! # {
-//! use opentelemetry::{global, trace::{Tracer, TracerProvider as _}};
-//! use opentelemetry_sdk::trace::TracerProvider;
+//! use opentelemetry::{global, trace::{Tracer, TracerProvider}};
+//! use opentelemetry_sdk::trace::SdkTracerProvider;
 //!
 //! fn main() {
 //!     // Choose an exporter like `opentelemetry_stdout::SpanExporter`