cont..

Author: lalitb

examples/tracing-grpc/src/client.rs

@@ -13,7 +13,7 @@ fn init_tracer() -> sdktrace::TracerProvider {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
     let provider = sdktrace::TracerProvider::builder()
-        .with_batch_exporter(SpanExporter::default(), Tokio)
+        .with_batch_exporter(SpanExporter::default())
         .build();
 
     global::set_tracer_provider(provider.clone());

examples/tracing-grpc/src/server.rs

@@ -15,7 +15,7 @@ fn init_tracer() -> TracerProvider {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
     let provider = TracerProvider::builder()
-        .with_batch_exporter(SpanExporter::default(), Tokio)
+        .with_batch_exporter(SpanExporter::default())
         .build();
 
     global::set_tracer_provider(provider.clone());

examples/tracing-jaeger/src/main.rs

@@ -14,7 +14,7 @@ fn init_tracer_provider() -> Result<opentelemetry_sdk::trace::TracerProvider, Tr
         .build()?;
 
     Ok(TracerProvider::builder()
-        .with_batch_exporter(exporter, runtime::Tokio)
+        .with_batch_exporter(exporter)
         .with_resource(
             Resource::builder()
                 .with_service_name("tracing-jaeger")

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

@@ -27,7 +27,7 @@ fn init_traces() -> Result<sdktrace::TracerProvider, TraceError> {
         .build()?;
     Ok(sdktrace::TracerProvider::builder()
         .with_resource(RESOURCE.clone())
-        .with_batch_exporter(exporter, runtime::Tokio)
+        .with_batch_exporter(exporter)
         .build())
 }
 

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

@@ -35,7 +35,7 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
     let exporter = exporter_builder.build()?;
 
     Ok(opentelemetry_sdk::trace::TracerProvider::builder()
-        .with_batch_exporter(exporter, runtime::Tokio)
+        .with_batch_exporter(exporter)
         .with_resource(
             Resource::builder_empty()
                 .with_service_name("basic-otlp-tracing-example")

opentelemetry-otlp/tests/smoke.rs

@@ -100,7 +100,6 @@ async fn smoke_tracer() {
                     .with_metadata(metadata)
                     .build()
                     .expect("NON gzip-tonic SpanExporter failed to build"),
-                opentelemetry_sdk::runtime::Tokio,
             )
             .build();
 

opentelemetry-sdk/src/trace/provider.rs

@@ -62,13 +62,9 @@
 ///     provider.shutdown();
 /// }
 /// ```
-#[cfg(feature = "experimental_trace_batch_span_processor_with_async_runtime")]
-use crate::runtime::RuntimeChannel;
-#[cfg(feature = "experimental_trace_batch_span_processor_with_async_runtime")]
-use crate::trace::span_processor_with_async_runtime::BatchSpanProcessor;
-#[cfg(not(feature = "experimental_trace_batch_span_processor_with_async_runtime"))]
-use crate::trace::BatchSpanProcessor;
-use crate::trace::{Config, RandomIdGenerator, Sampler, SimpleSpanProcessor, SpanLimits, Tracer};
+use crate::trace::{
+    BatchSpanProcessor, Config, RandomIdGenerator, Sampler, SimpleSpanProcessor, SpanLimits, Tracer,
+};
 use crate::Resource;
 use crate::{export::trace::SpanExporter, trace::SpanProcessor};
 use opentelemetry::trace::TraceError;
@@ -298,18 +294,6 @@ impl Builder {
         Builder { processors, ..self }
     }
 
-    #[cfg(feature = "experimental_trace_batch_span_processor_with_async_runtime")]
-    /// The [`SpanExporter`] setup using a default [`BatchSpanProcessor`] that this provider should use.
-    pub fn with_batch_exporter<T: SpanExporter + 'static, R: RuntimeChannel>(
-        self,
-        exporter: T,
-        runtime: R,
-    ) -> Self {
-        let batch = BatchSpanProcessor::builder(exporter, runtime).build();
-        self.with_span_processor(batch)
-    }
-
-    #[cfg(not(feature = "experimental_trace_batch_span_processor_with_async_runtime"))]
     /// The [`SpanExporter`] setup using a default [`BatchSpanProcessor`] that this provider should use.
     pub fn with_batch_exporter<T: SpanExporter + 'static>(self, exporter: T) -> Self {
         let batch = BatchSpanProcessor::builder(exporter).build();

opentelemetry-sdk/src/trace/runtime_tests.rs

@@ -46,15 +46,18 @@ impl SpanCountExporter {
     }
 }
 
-#[cfg(feature = "experimental_trace_batch_span_processor_with_async_runtime")]
 #[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
 fn build_batch_tracer_provider<R: RuntimeChannel>(
     exporter: SpanCountExporter,
     runtime: R,
 ) -> crate::trace::TracerProvider {
     use crate::trace::TracerProvider;
+    let processor = crate::trace::span_processor_with_async_runtime::BatchSpanProcessor::builder(
+        exporter, runtime,
+    )
+    .build();
     TracerProvider::builder()
-        .with_batch_exporter(exporter, runtime)
+        .with_span_processor(processor)
         .build()
 }
 

opentelemetry-sdk/src/trace/span_processor.rs

@@ -720,8 +720,7 @@ mod tests {
 
     use futures_util::future::BoxFuture;
     use futures_util::FutureExt;
-    use std::sync::Arc;
-    use std::sync::Mutex;
+    use std::sync::{Arc, Mutex};
 
     // Mock exporter to test functionality
     #[derive(Debug)]

opentelemetry-zipkin/src/exporter/mod.rs

@@ -11,7 +11,6 @@ use opentelemetry_http::HttpClient;
 use opentelemetry_sdk::{
     export::{trace, ExportError},
     resource::{ResourceDetector, SdkProvidedResourceDetector},
-    runtime::RuntimeChannel,
     trace::{Config, Tracer, TracerProvider},
     Resource,
 };
@@ -165,13 +164,12 @@ impl ZipkinPipelineBuilder {
     /// Install the Zipkin trace exporter pipeline with a batch span processor using the specified
     /// runtime.
     #[allow(deprecated)]
-    pub fn install_batch<R: RuntimeChannel>(
+    pub fn install_batch(
         mut self,
-        runtime: R,
     ) -> Result<(Tracer, opentelemetry_sdk::trace::TracerProvider), TraceError> {
         let (config, endpoint) = self.init_config_and_endpoint();
         let exporter = self.init_exporter_with_endpoint(endpoint)?;
-        let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter, runtime);
+        let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter);
         provider_builder = provider_builder.with_config(config);
         let provider = provider_builder.build();
         let scope = InstrumentationScope::builder("opentelemetry-zipkin")