Merge branch 'main' into otel-trace-appender-bump

Author: lalitb

opentelemetry/src/logs/logger.rs

@@ -36,7 +36,7 @@ pub trait LoggerProvider {
     /// ```
     /// use opentelemetry::InstrumentationScope;
     /// use opentelemetry::logs::LoggerProvider;
-    /// use opentelemetry_sdk::logs::LoggerProvider as SdkLoggerProvider;
+    /// use opentelemetry_sdk::logs::SdkLoggerProvider;
     ///
     /// let provider = SdkLoggerProvider::builder().build();
     ///

opentelemetry/src/propagation/composite.rs

@@ -49,7 +49,7 @@ use std::collections::HashSet;
 /// let mut injector = HashMap::new();
 ///
 /// // And a given span
-/// let example_span = sdktrace::TracerProvider::default()
+/// let example_span = sdktrace::SdkTracerProvider::default()
 ///     .tracer("example-component")
 ///     .start("span-name");
 ///