Merge branch 'main' into observable-gauge-collect-if-changed

Author: cijothomas

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/exporter/http/trace.rs

@@ -1,29 +1,35 @@
 use std::sync::Arc;
 
+use super::OtlpHttpClient;
 use futures_core::future::BoxFuture;
 use http::{header::CONTENT_TYPE, Method};
-use opentelemetry::{otel_debug, trace::TraceError};
-use opentelemetry_sdk::trace::{ExportResult, SpanData, SpanExporter};
-
-use super::OtlpHttpClient;
+use opentelemetry::otel_debug;
+use opentelemetry_sdk::{
+    error::{OTelSdkError, OTelSdkResult},
+    trace::{SpanData, SpanExporter},
+};
 
 impl SpanExporter for OtlpHttpClient {
-    fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, ExportResult> {
+    fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
         let client = match self
             .client
             .lock()
-            .map_err(|e| TraceError::Other(e.to_string().into()))
+            .map_err(|e| OTelSdkError::InternalFailure(format!("Mutex lock failed: {}", e)))
             .and_then(|g| match &*g {
                 Some(client) => Ok(Arc::clone(client)),
-                _ => Err(TraceError::Other("exporter is already shut down".into())),
+                _ => Err(OTelSdkError::AlreadyShutdown),
             }) {
             Ok(client) => client,
             Err(err) => return Box::pin(std::future::ready(Err(err))),
         };
 
         let (body, content_type) = match self.build_trace_export_body(batch) {
             Ok(body) => body,
-            Err(e) => return Box::pin(std::future::ready(Err(e))),
+            Err(e) => {
+                return Box::pin(std::future::ready(Err(OTelSdkError::InternalFailure(
+                    e.to_string(),
+                ))))
+            }
         };
 
         let mut request = match http::Request::builder()
@@ -34,10 +40,9 @@ impl SpanExporter for OtlpHttpClient {
         {
             Ok(req) => req,
             Err(e) => {
-                return Box::pin(std::future::ready(Err(crate::Error::RequestFailed(
-                    Box::new(e),
-                )
-                .into())))
+                return Box::pin(std::future::ready(Err(OTelSdkError::InternalFailure(
+                    e.to_string(),
+                ))))
             }
         };
 
@@ -48,7 +53,10 @@ impl SpanExporter for OtlpHttpClient {
         Box::pin(async move {
             let request_uri = request.uri().to_string();
             otel_debug!(name: "HttpTracesClient.CallingExport");
-            let response = client.send_bytes(request).await?;
+            let response = client
+                .send_bytes(request)
+                .await
+                .map_err(|e| OTelSdkError::InternalFailure(format!("{e:?}")))?;
 
             if !response.status().is_success() {
                 let error = format!(
@@ -57,15 +65,23 @@ impl SpanExporter for OtlpHttpClient {
                     request_uri,
                     response.body()
                 );
-                return Err(TraceError::Other(error.into()));
+                return Err(OTelSdkError::InternalFailure(error));
             }
 
             Ok(())
         })
     }
 
-    fn shutdown(&mut self) {
-        let _ = self.client.lock().map(|mut c| c.take());
+    fn shutdown(&mut self) -> OTelSdkResult {
+        let mut client_guard = self.client.lock().map_err(|e| {
+            OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {}", e))
+        })?;
+
+        if client_guard.take().is_none() {
+            return Err(OTelSdkError::AlreadyShutdown);
+        }
+
+        Ok(())
     }
 
     fn set_resource(&mut self, resource: &opentelemetry_sdk::Resource) {