Drop include_trace_context parameter from Logs API/SDK

opentelemetry-api/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Removed
 
+- Drop include_trace_context parameter from Logs API/SDK. [#1133](https://github.com/open-telemetry/opentelemetry-rust/issues/1132) 
 - Synchronous instruments no longer accepts `Context` while reporting
   measurements. [#1076](https://github.com/open-telemetry/opentelemetry-rust/pull/1076).
 

opentelemetry-api/src/global/logs.rs

@@ -27,7 +27,6 @@
         version: Option<Cow<'static, str>>,
         schema_url: Option<Cow<'static, str>>,
         attributes: Option<Vec<KeyValue>>,
-        include_trace_context: bool,
     ) -> Box<dyn Logger + Send + Sync + 'static>;
 }
 
@@ -42,15 +41,8 @@
         version: Option<Cow<'static, str>>,
         schema_url: Option<Cow<'static, str>>,
         attributes: Option<Vec<KeyValue>>,
-        include_trace_context: bool,
     ) -> Box<dyn Logger + Send + Sync + 'static> {
-        Box::new(self.versioned_logger(
-            name,
-            version,
-            schema_url,
-            attributes,
-            include_trace_context,
-        ))
+        Box::new(self.versioned_logger(name, version, schema_url, attributes))
     }
 }
 
@@ -102,14 +94,12 @@
         version: Option<Cow<'static, str>>,
         schema_url: Option<Cow<'static, str>>,
         attributes: Option<Vec<KeyValue>>,
-        include_trace_context: bool,
     ) -> Self::Logger {
         BoxedLogger(self.provider.versioned_logger_boxed(
             name.into(),
             version,
             schema_url,
             attributes,
-            include_trace_context,
         ))
     }
 }

opentelemetry-api/src/logs/logger.rs

@@ -4,10 +4,8 @@
 
 /// The interface for emitting [`LogRecord`]s.
 pub trait Logger {
-    /// Emit a [`LogRecord`]. If this `Logger` was created with
-    /// `include_trace_context` set to `true`, the logger will set the record's
-    /// [`TraceContext`] to the active trace context, using the current thread's
-    /// [`Context`].
+    /// Emit a [`LogRecord`]. If there is active current thread's [`Context`],
+    ///  the logger will set the record's [`TraceContext`] to the active trace context,
     ///
     /// [`Context`]: crate::Context
     /// [`TraceContext`]: crate::logs::TraceContext
@@ -24,21 +22,12 @@
     /// The `name` should be the application name or the name of the library
     /// providing instrumentation. If the name is empty, then an
     /// implementation-defined default name may be used instead.
-    ///
-    /// If `include_trace_context` is `true`, the newly created [`Logger`]
-    /// should set the [`TraceContext`] associated with a record to the
-    /// current thread's active trace context, using [`Context`].
-    ///
-    /// [`Context`]: crate::Context
-    /// [`TraceContext`]: crate::logs::TraceContext
-
     fn versioned_logger(
         &self,
         name: impl Into<Cow<'static, str>>,
         version: Option<Cow<'static, str>>,
         schema_url: Option<Cow<'static, str>>,
         attributes: Option<Vec<KeyValue>>,
-        include_trace_context: bool,
     ) -> Self::Logger;
 
     /// Returns a new logger with the given name.
@@ -47,6 +36,6 @@
     /// providing instrumentation. If the name is empty, then an
     /// implementation-defined default name may be used instead.
     fn logger(&self, name: impl Into<Cow<'static, str>>) -> Self::Logger {
-        self.versioned_logger(name, None, None, None, true)
+        self.versioned_logger(name, None, None, None)
     }
 }

opentelemetry-api/src/logs/noop.rs

@@ -25,7 +25,6 @@ impl LoggerProvider for NoopLoggerProvider {
         _version: Option<Cow<'static, str>>,
         _schema_url: Option<Cow<'static, str>>,
         _attributes: Option<Vec<KeyValue>>,
-        _include_trace_context: bool,
     ) -> Self::Logger {
         NoopLogger(())
     }

opentelemetry-otlp/src/logs.rs

@@ -417,16 +417,12 @@
     /// current crate version, using the configured log exporter.
     ///
     /// [`Logger`]: opentelemetry_sdk::logs::Logger
-    pub fn simple(
-        self,
-        include_trace_context: bool,
-    ) -> Result<opentelemetry_sdk::logs::Logger, LogError> {
+    pub fn simple(self) -> Result<opentelemetry_sdk::logs::Logger, LogError> {
         Ok(build_simple_with_exporter(
             self.exporter_builder
                 .ok_or(crate::Error::NoExporterBuilder)?
                 .build_log_exporter()?,
             self.log_config,
-            include_trace_context,
         ))
     }
 
@@ -438,23 +434,20 @@
     pub fn batch<R: RuntimeChannel<BatchMessage>>(
         self,
         runtime: R,
-        include_trace_context: bool,
     ) -> Result<opentelemetry_sdk::logs::Logger, LogError> {
         Ok(build_batch_with_exporter(
             self.exporter_builder
                 .ok_or(crate::Error::NoExporterBuilder)?
                 .build_log_exporter()?,
             self.log_config,
             runtime,
-            include_trace_context,
         ))
     }
 }
 
 fn build_simple_with_exporter(
     exporter: LogExporter,
     log_config: Option<opentelemetry_sdk::logs::Config>,
-    include_trace_context: bool,
 ) -> opentelemetry_sdk::logs::Logger {
     let mut provider_builder =
         opentelemetry_sdk::logs::LoggerProvider::builder().with_simple_exporter(exporter);
@@ -467,15 +460,13 @@
         Some(Cow::Borrowed(env!("CARGO_PKG_VERSION"))),
         None,
         None,
-        include_trace_context,
     )
 }
 
 fn build_batch_with_exporter<R: RuntimeChannel<BatchMessage>>(
     exporter: LogExporter,
     log_config: Option<opentelemetry_sdk::logs::Config>,
     runtime: R,
-    include_trace_context: bool,
 ) -> opentelemetry_sdk::logs::Logger {
     let mut provider_builder =
         opentelemetry_sdk::logs::LoggerProvider::builder().with_batch_exporter(exporter, runtime);
@@ -488,6 +479,5 @@
         Some(Cow::Borrowed("CARGO_PKG_VERSION")),
         None,
         None,
-        include_trace_context,
     )
 }

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -33,7 +33,6 @@
         version: Option<Cow<'static, str>>,
         schema_url: Option<Cow<'static, str>>,
         attributes: Option<Vec<opentelemetry_api::KeyValue>>,
-        include_trace_context: bool,
     ) -> Logger {
         let name = name.into();
 
@@ -46,7 +45,6 @@
         Logger::new(
             InstrumentationLibrary::new(component_name, version, schema_url, attributes),
             Arc::downgrade(&self.inner),
-            include_trace_context,
         )
     }
 }
@@ -170,7 +168,6 @@
 ///
 /// [`LogRecord`]: opentelemetry_api::logs::LogRecord
 pub struct Logger {
-    include_trace_context: bool,
     instrumentation_lib: InstrumentationLibrary,
     provider: Weak<LoggerProviderInner>,
 }
@@ -179,10 +176,8 @@
     pub(crate) fn new(
         instrumentation_lib: InstrumentationLibrary,
         provider: Weak<LoggerProviderInner>,
-        include_trace_context: bool,
     ) -> Self {
         Logger {
-            include_trace_context,
             instrumentation_lib,
             provider,
         }
@@ -210,12 +205,10 @@
         let config = provider.config();
         for processor in provider.log_processors() {
             let mut record = record.clone();
-            if self.include_trace_context {
-                let ctx = Context::current();
-                if ctx.has_active_span() {
-                    let span = ctx.span();
-                    record.trace_context = Some(span.span_context().into());
-                }
+            let ctx = Context::current();
+            if ctx.has_active_span() {
+                let span = ctx.span();
+                record.trace_context = Some(span.span_context().into());
             }
             let data = LogData {
                 record,