Merge branch 'main' into anujnegi/disable-name-check

anujnegi270 · web-flow · commit 392a5ca0ed5d · 2025-01-24T16:08:15.000+05:30
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
@@ -285,8 +285,12 @@ limit.
 - *Breaking*: Rename namespaces for InMemoryExporters. (The module is still under "testing" feature flag)
   before:
   `opentelemetry_sdk::testing::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`
+  `opentelemetry_sdk::testing::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder};`
+  `opentelemetry_sdk::testing::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};`
   now:
   `opentelemetry_sdk::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`
+  `opentelemetry_sdk::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder};`
+  `opentelemetry_sdk::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};`
 
 ## 0.27.1
 
diff --git a/opentelemetry-sdk/src/metrics/in_memory_exporter.rs b/opentelemetry-sdk/src/metrics/in_memory_exporter.rs
@@ -27,7 +27,7 @@ use std::sync::{Arc, Mutex};
 ///# use opentelemetry_sdk::metrics;
 ///# use opentelemetry::{KeyValue};
 ///# use opentelemetry::metrics::MeterProvider;
-///# use opentelemetry_sdk::testing::metrics::InMemoryMetricExporter;
+///# use opentelemetry_sdk::metrics::InMemoryMetricExporter;
 ///# use opentelemetry_sdk::metrics::PeriodicReader;
 ///
 ///# #[tokio::main]
@@ -86,7 +86,7 @@ impl Default for InMemoryMetricExporter {
 /// # Example
 ///
 /// ```
-/// # use opentelemetry_sdk::testing::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
+/// # use opentelemetry_sdk::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
 ///
 /// let exporter = InMemoryMetricExporterBuilder::new().build();
 /// ```
@@ -138,7 +138,7 @@ impl InMemoryMetricExporter {
     /// # Example
     ///
     /// ```
-    /// # use opentelemetry_sdk::testing::metrics::InMemoryMetricExporter;
+    /// # use opentelemetry_sdk::metrics::InMemoryMetricExporter;
     ///
     /// let exporter = InMemoryMetricExporter::default();
     /// let finished_metrics = exporter.get_finished_metrics().unwrap();
@@ -155,7 +155,7 @@ impl InMemoryMetricExporter {
     /// # Example
     ///
     /// ```
-    /// # use opentelemetry_sdk::testing::metrics::InMemoryMetricExporter;
+    /// # use opentelemetry_sdk::metrics::InMemoryMetricExporter;
     ///
     /// let exporter = InMemoryMetricExporter::default();
     /// exporter.reset();
diff --git a/opentelemetry-sdk/src/metrics/mod.rs b/opentelemetry-sdk/src/metrics/mod.rs
@@ -57,6 +57,14 @@ pub(crate) mod pipeline;
 pub mod reader;
 pub(crate) mod view;
 
+/// In-Memory metric exporter for testing purpose.
+#[cfg(any(feature = "testing", test))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
+pub mod in_memory_exporter;
+#[cfg(any(feature = "testing", test))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
+pub use in_memory_exporter::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
+
 pub use aggregation::*;
 pub use error::{MetricError, MetricResult};
 pub use manual_reader::*;
@@ -107,8 +115,8 @@ mod tests {
     use super::*;
     use crate::metrics::data::Aggregation;
     use crate::metrics::data::ResourceMetrics;
-    use crate::testing::metrics::InMemoryMetricExporter;
-    use crate::testing::metrics::InMemoryMetricExporterBuilder;
+    use crate::metrics::InMemoryMetricExporter;
+    use crate::metrics::InMemoryMetricExporterBuilder;
     use data::Gauge;
     use data::GaugeDataPoint;
     use data::Histogram;
diff --git a/opentelemetry-sdk/src/metrics/periodic_reader.rs b/opentelemetry-sdk/src/metrics/periodic_reader.rs
@@ -468,11 +468,11 @@ impl MetricReader for PeriodicReader {
 mod tests {
     use super::PeriodicReader;
     use crate::{
+        metrics::InMemoryMetricExporter,
         metrics::{
             data::ResourceMetrics, exporter::PushMetricExporter, reader::MetricReader, MetricError,
             MetricResult, SdkMeterProvider, Temporality,
         },
-        testing::metrics::InMemoryMetricExporter,
         Resource,
     };
     use async_trait::async_trait;
diff --git a/opentelemetry-sdk/src/metrics/periodic_reader_with_async_runtime.rs b/opentelemetry-sdk/src/metrics/periodic_reader_with_async_runtime.rs
@@ -416,8 +416,8 @@ mod tests {
     use crate::metrics::reader::MetricReader;
     use crate::metrics::MetricError;
     use crate::{
-        metrics::data::ResourceMetrics, metrics::SdkMeterProvider, runtime,
-        testing::metrics::InMemoryMetricExporter, Resource,
+        metrics::data::ResourceMetrics, metrics::InMemoryMetricExporter, metrics::SdkMeterProvider,
+        runtime, Resource,
     };
     use opentelemetry::metrics::MeterProvider;
     use std::sync::mpsc;
diff --git a/opentelemetry-sdk/src/testing/metrics/mod.rs b/opentelemetry-sdk/src/testing/metrics/mod.rs
@@ -1,10 +1,4 @@
-//! In-Memory metrics exporter for testing purpose.
-
-/// The `in_memory_exporter` module provides in-memory metrics exporter.
-/// For detailed usage and examples, see `in_memory_exporter`.
-pub mod in_memory_exporter;
-pub use in_memory_exporter::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
-
+//! Structs for tests.
 #[doc(hidden)]
 pub mod metric_reader;
 pub use metric_reader::TestMetricReader;
diff --git a/opentelemetry-sdk/src/testing/mod.rs b/opentelemetry-sdk/src/testing/mod.rs
@@ -1,5 +1,6 @@
 //! In-Memory exporters for testing purpose.
 
+/// Structs used for testing
 #[cfg(all(feature = "testing", feature = "trace"))]
 pub mod trace;
 
diff --git a/opentelemetry-sdk/src/testing/trace/mod.rs b/opentelemetry-sdk/src/testing/trace/mod.rs
@@ -1,10 +1,3 @@
-//! In-Memory trace exporter for testing purpose.
-
-/// The `in_memory_exporter` module provides in-memory trace exporter.
-/// For detailed usage and examples, see `in_memory_exporter`.
-pub mod in_memory_exporter;
-pub use in_memory_exporter::{InMemorySpanExporter, InMemorySpanExporterBuilder};
-
 #[doc(hidden)]
 mod span_exporters;
 pub use span_exporters::*;
diff --git a/opentelemetry-sdk/src/trace/in_memory_exporter.rs b/opentelemetry-sdk/src/trace/in_memory_exporter.rs
@@ -15,7 +15,7 @@ use std::sync::{Arc, Mutex};
 ///# use opentelemetry::{global, trace::Tracer, Context};
 ///# use opentelemetry_sdk::propagation::TraceContextPropagator;
 ///# use opentelemetry_sdk::runtime;
-///# use opentelemetry_sdk::testing::trace::InMemorySpanExporterBuilder;
+///# use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
 ///# use opentelemetry_sdk::trace::{BatchSpanProcessor, TracerProvider};
 ///
 ///# #[tokio::main]
@@ -64,7 +64,7 @@ impl Default for InMemorySpanExporter {
 /// Builder for [`InMemorySpanExporter`].
 /// # Example
 /// ```
-///# use opentelemetry_sdk::testing::trace::InMemorySpanExporterBuilder;
+///# use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
 ///
 /// let exporter = InMemorySpanExporterBuilder::new().build();
 /// ```
@@ -102,7 +102,7 @@ impl InMemorySpanExporter {
     /// # Example
     ///
     /// ```
-    /// # use opentelemetry_sdk::testing::trace::InMemorySpanExporter;
+    /// # use opentelemetry_sdk::trace::InMemorySpanExporter;
     ///
     /// let exporter = InMemorySpanExporter::default();
     /// let finished_spans = exporter.get_finished_spans().unwrap();
@@ -119,7 +119,7 @@ impl InMemorySpanExporter {
     /// # Example
     ///
     /// ```
-    /// # use opentelemetry_sdk::testing::trace::InMemorySpanExporter;
+    /// # use opentelemetry_sdk::trace::InMemorySpanExporter;
     ///
     /// let exporter = InMemorySpanExporter::default();
     /// exporter.reset();
diff --git a/opentelemetry-sdk/src/trace/mod.rs b/opentelemetry-sdk/src/trace/mod.rs
@@ -25,6 +25,14 @@ pub use config::{config, Config};
 pub use events::SpanEvents;
 pub use export::{ExportResult, SpanData, SpanExporter};
 
+/// In-Memory span exporter for testing purpose.
+#[cfg(any(feature = "testing", test))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
+pub mod in_memory_exporter;
+#[cfg(any(feature = "testing", test))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
+pub use in_memory_exporter::{InMemorySpanExporter, InMemorySpanExporterBuilder};
+
 pub use id_generator::{IdGenerator, RandomIdGenerator};
 pub use links::SpanLinks;
 pub use provider::{Builder, TracerProvider};
@@ -50,8 +58,8 @@ mod tests {
 
     use super::*;
     use crate::{
-        testing::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder},
         trace::span_limit::{DEFAULT_MAX_EVENT_PER_SPAN, DEFAULT_MAX_LINKS_PER_SPAN},
+        trace::{InMemorySpanExporter, InMemorySpanExporterBuilder},
     };
     use opentelemetry::trace::{
         SamplingDecision, SamplingResult, SpanKind, Status, TraceContextExt, TraceState,
diff --git a/opentelemetry-sdk/src/trace/span_processor.rs b/opentelemetry-sdk/src/trace/span_processor.rs
@@ -814,11 +814,12 @@ mod tests {
         OTEL_BSP_MAX_EXPORT_BATCH_SIZE, OTEL_BSP_MAX_QUEUE_SIZE, OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT,
         OTEL_BSP_SCHEDULE_DELAY, OTEL_BSP_SCHEDULE_DELAY_DEFAULT,
     };
-    use crate::testing::trace::{new_test_export_span_data, InMemorySpanExporterBuilder};
+    use crate::testing::trace::new_test_export_span_data;
     use crate::trace::span_processor::{
         OTEL_BSP_EXPORT_TIMEOUT_DEFAULT, OTEL_BSP_MAX_CONCURRENT_EXPORTS,
         OTEL_BSP_MAX_CONCURRENT_EXPORTS_DEFAULT, OTEL_BSP_MAX_EXPORT_BATCH_SIZE_DEFAULT,
     };
+    use crate::trace::InMemorySpanExporterBuilder;
     use crate::trace::{BatchConfig, BatchConfigBuilder, SpanEvents, SpanLinks};
     use crate::trace::{ExportResult, SpanData, SpanExporter};
     use opentelemetry::trace::{SpanContext, SpanId, SpanKind, Status};
diff --git a/opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs b/opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs
@@ -421,14 +421,12 @@ mod tests {
     // cargo test trace::span_processor::tests:: --features=testing
     use super::{BatchSpanProcessor, SpanProcessor};
     use crate::runtime;
-    use crate::testing::trace::{
-        new_test_export_span_data, new_tokio_test_exporter, InMemorySpanExporterBuilder,
-    };
+    use crate::testing::trace::{new_test_export_span_data, new_tokio_test_exporter};
     use crate::trace::span_processor::{
         OTEL_BSP_EXPORT_TIMEOUT, OTEL_BSP_MAX_EXPORT_BATCH_SIZE, OTEL_BSP_MAX_QUEUE_SIZE,
         OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT, OTEL_BSP_SCHEDULE_DELAY, OTEL_BSP_SCHEDULE_DELAY_DEFAULT,
     };
-    use crate::trace::{BatchConfig, BatchConfigBuilder};
+    use crate::trace::{BatchConfig, BatchConfigBuilder, InMemorySpanExporterBuilder};
     use crate::trace::{ExportResult, SpanData, SpanExporter};
     use futures_util::Future;
     use std::fmt::Debug;
diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Bump msrv to 1.75.0.
 - **Breaking** `opentelemetry::global::shutdown_tracer_provider()` Removed from this crate, should now use `tracer_provider.shutdown()` see [#2369](https://github.com/open-telemetry/opentelemetry-rust/pull/2369) for a migration example.
+- *Breaking* Removed unused `opentelemetry::PropagationError` struct.
 
 ## 0.27.1
 
diff --git a/opentelemetry/src/propagation/mod.rs b/opentelemetry/src/propagation/mod.rs
@@ -20,7 +20,6 @@
 //! [`Context`]: crate::Context
 
 use std::collections::HashMap;
-use thiserror::Error;
 
 pub mod composite;
 pub mod text_map_propagator;
@@ -62,37 +61,6 @@ impl<S: std::hash::BuildHasher> Extractor for HashMap<String, String, S> {
     }
 }
 
-/// Error when extracting or injecting context data(i.e propagating) across application boundaries.
-#[derive(Error, Debug)]
-#[error("Cannot {} from {}, {}", ops, message, propagator_name)]
-pub struct PropagationError {
-    message: &'static str,
-    // which propagator does this error comes from
-    propagator_name: &'static str,
-    // are we extracting or injecting information across application boundaries
-    ops: &'static str,
-}
-
-impl PropagationError {
-    /// Error happens when extracting information
-    pub fn extract(message: &'static str, propagator_name: &'static str) -> Self {
-        PropagationError {
-            message,
-            propagator_name,
-            ops: "extract",
-        }
-    }
-
-    /// Error happens when extracting information
-    pub fn inject(message: &'static str, propagator_name: &'static str) -> Self {
-        PropagationError {
-            message,
-            propagator_name,
-            ops: "inject",
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
