Fix logs feature dependency on trace feature

Co-authored-by: cijothomas <[email protected]>

Author: Copilot

opentelemetry-sdk/Cargo.toml

@@ -42,7 +42,7 @@ pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
 default = ["trace", "metrics", "logs", "internal-logs"]
 trace = ["opentelemetry/trace", "rand", "percent-encoding"]
 jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url", "experimental_async_runtime"]
-logs = ["opentelemetry/logs", "opentelemetry/trace", "serde_json"]
+logs = ["opentelemetry/logs", "serde_json"]
 spec_unstable_logs_enabled = ["logs", "opentelemetry/spec_unstable_logs_enabled"]
 metrics = ["opentelemetry/metrics"]
 testing = ["opentelemetry/testing", "trace", "metrics", "logs", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]

opentelemetry-sdk/src/logs/in_memory_exporter.rs

@@ -132,6 +132,7 @@ impl InMemoryLogExporterBuilder {
 
     /// If set, the records will not be [`InMemoryLogExporter::reset`] on shutdown.
     #[cfg(test)]
+    #[allow(dead_code)]
     pub(crate) fn keep_records_on_shutdown(self) -> Self {
         Self {
             reset_on_shutdown: false,

opentelemetry-sdk/src/logs/logger.rs

@@ -1,5 +1,9 @@
-use super::{SdkLogRecord, SdkLoggerProvider, TraceContext};
-use opentelemetry::{trace::TraceContextExt, Context, InstrumentationScope};
+use super::{SdkLogRecord, SdkLoggerProvider};
+#[cfg(feature = "trace")]
+use super::TraceContext;
+use opentelemetry::{Context, InstrumentationScope};
+#[cfg(feature = "trace")]
+use opentelemetry::trace::TraceContextExt;
 
 #[cfg(feature = "spec_unstable_logs_enabled")]
 use opentelemetry::logs::Severity;
@@ -37,6 +41,7 @@ impl opentelemetry::logs::Logger for SdkLogger {
 
         //let mut log_record = record;
         if record.trace_context.is_none() {
+            #[cfg(feature = "trace")]
             Context::map_current(|cx| {
                 cx.has_active_span().then(|| {
                     record.trace_context = Some(TraceContext::from(cx.span().span_context()))

opentelemetry-sdk/src/logs/logger_provider.rs

@@ -284,20 +284,25 @@ impl LoggerProviderBuilder {
 #[cfg(test)]
 mod tests {
     use crate::{
-        logs::{InMemoryLogExporter, LogBatch, SdkLogRecord, TraceContext},
+        logs::{InMemoryLogExporter, LogBatch, SdkLogRecord},
         resource::{
             SERVICE_NAME, TELEMETRY_SDK_LANGUAGE, TELEMETRY_SDK_NAME, TELEMETRY_SDK_VERSION,
         },
-        trace::SdkTracerProvider,
         Resource,
     };
+    #[cfg(feature = "trace")]
+    use crate::logs::TraceContext;
+    #[cfg(feature = "trace")]
+    use crate::trace::SdkTracerProvider;
 
     use super::*;
+    #[cfg(feature = "trace")]
     use opentelemetry::trace::{SpanId, TraceId, Tracer as _, TracerProvider};
     use opentelemetry::{
         logs::{AnyValue, LogRecord as _, Logger, LoggerProvider},
-        trace::TraceContextExt,
     };
+    #[cfg(feature = "trace")]
+    use opentelemetry::trace::TraceContextExt;
     use opentelemetry::{Key, KeyValue, Value};
     use std::fmt::{Debug, Formatter};
     use std::sync::atomic::AtomicU64;
@@ -591,6 +596,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "trace")]
     fn trace_context_test() {
         let exporter = InMemoryLogExporter::default();
 
@@ -607,8 +613,8 @@ mod tests {
         tracer.in_span("test-span", |cx| {
             let ambient_ctxt = cx.span().span_context().clone();
             let explicit_ctxt = TraceContext {
-                trace_id: TraceId::from_u128(13),
-                span_id: SpanId::from_u64(14),
+                trace_id: TraceId::from(13),
+                span_id: SpanId::from(14),
                 trace_flags: None,
             };
 

opentelemetry-sdk/src/logs/record.rs

@@ -1,9 +1,11 @@
 use crate::growable_array::GrowableArray;
 use opentelemetry::{
     logs::{AnyValue, Severity},
-    trace::{SpanContext, SpanId, TraceFlags, TraceId},
+    SpanId, TraceFlags, TraceId,
     Key,
 };
+#[cfg(feature = "trace")]
+use opentelemetry::trace::SpanContext;
 use std::{borrow::Cow, time::SystemTime};
 
 // According to a Go-specific study mentioned on https://go.dev/blog/slog,
@@ -216,6 +218,7 @@ pub struct TraceContext {
     pub trace_flags: Option<TraceFlags>,
 }
 
+#[cfg(feature = "trace")]
 impl From<&SpanContext> for TraceContext {
     fn from(span_context: &SpanContext) -> Self {
         TraceContext {