Skip to content

Commit 6a13678

Browse files
authored
Move inmemory exporter for spans to diff namespace (#2544)
1 parent 97cf951 commit 6a13678

File tree

7 files changed

+20
-17
lines changed

7 files changed

+20
-17
lines changed

opentelemetry-sdk/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,10 @@ limit.
285285
- *Breaking*: Rename namespaces for InMemoryExporters. (The module is still under "testing" feature flag)
286286
before:
287287
`opentelemetry_sdk::testing::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`
288+
`opentelemetry_sdk::testing::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder};`
288289
now:
289290
`opentelemetry_sdk::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`
291+
`opentelemetry_sdk::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder};`
290292

291293
## 0.27.1
292294

opentelemetry-sdk/src/testing/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//! In-Memory exporters for testing purpose.
22
3+
/// Structs used for testing
34
#[cfg(all(feature = "testing", feature = "trace"))]
45
pub mod trace;
56

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//! In-Memory trace exporter for testing purpose.
2-
3-
/// The `in_memory_exporter` module provides in-memory trace exporter.
4-
/// For detailed usage and examples, see `in_memory_exporter`.
5-
pub mod in_memory_exporter;
6-
pub use in_memory_exporter::{InMemorySpanExporter, InMemorySpanExporterBuilder};
7-
81
#[doc(hidden)]
92
mod span_exporters;
103
pub use span_exporters::*;

opentelemetry-sdk/src/testing/trace/in_memory_exporter.rs opentelemetry-sdk/src/trace/in_memory_exporter.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::sync::{Arc, Mutex};
1515
///# use opentelemetry::{global, trace::Tracer, Context};
1616
///# use opentelemetry_sdk::propagation::TraceContextPropagator;
1717
///# use opentelemetry_sdk::runtime;
18-
///# use opentelemetry_sdk::testing::trace::InMemorySpanExporterBuilder;
18+
///# use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
1919
///# use opentelemetry_sdk::trace::{BatchSpanProcessor, TracerProvider};
2020
///
2121
///# #[tokio::main]
@@ -64,7 +64,7 @@ impl Default for InMemorySpanExporter {
6464
/// Builder for [`InMemorySpanExporter`].
6565
/// # Example
6666
/// ```
67-
///# use opentelemetry_sdk::testing::trace::InMemorySpanExporterBuilder;
67+
///# use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
6868
///
6969
/// let exporter = InMemorySpanExporterBuilder::new().build();
7070
/// ```
@@ -102,7 +102,7 @@ impl InMemorySpanExporter {
102102
/// # Example
103103
///
104104
/// ```
105-
/// # use opentelemetry_sdk::testing::trace::InMemorySpanExporter;
105+
/// # use opentelemetry_sdk::trace::InMemorySpanExporter;
106106
///
107107
/// let exporter = InMemorySpanExporter::default();
108108
/// let finished_spans = exporter.get_finished_spans().unwrap();
@@ -119,7 +119,7 @@ impl InMemorySpanExporter {
119119
/// # Example
120120
///
121121
/// ```
122-
/// # use opentelemetry_sdk::testing::trace::InMemorySpanExporter;
122+
/// # use opentelemetry_sdk::trace::InMemorySpanExporter;
123123
///
124124
/// let exporter = InMemorySpanExporter::default();
125125
/// exporter.reset();

opentelemetry-sdk/src/trace/mod.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ pub use config::{config, Config};
2525
pub use events::SpanEvents;
2626
pub use export::{ExportResult, SpanData, SpanExporter};
2727

28+
/// In-Memory span exporter for testing purpose.
29+
#[cfg(any(feature = "testing", test))]
30+
#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
31+
pub mod in_memory_exporter;
32+
#[cfg(any(feature = "testing", test))]
33+
#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
34+
pub use in_memory_exporter::{InMemorySpanExporter, InMemorySpanExporterBuilder};
35+
2836
pub use id_generator::{IdGenerator, RandomIdGenerator};
2937
pub use links::SpanLinks;
3038
pub use provider::{Builder, TracerProvider};
@@ -50,8 +58,8 @@ mod tests {
5058

5159
use super::*;
5260
use crate::{
53-
testing::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder},
5461
trace::span_limit::{DEFAULT_MAX_EVENT_PER_SPAN, DEFAULT_MAX_LINKS_PER_SPAN},
62+
trace::{InMemorySpanExporter, InMemorySpanExporterBuilder},
5563
};
5664
use opentelemetry::trace::{
5765
SamplingDecision, SamplingResult, SpanKind, Status, TraceContextExt, TraceState,

opentelemetry-sdk/src/trace/span_processor.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -814,11 +814,12 @@ mod tests {
814814
OTEL_BSP_MAX_EXPORT_BATCH_SIZE, OTEL_BSP_MAX_QUEUE_SIZE, OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT,
815815
OTEL_BSP_SCHEDULE_DELAY, OTEL_BSP_SCHEDULE_DELAY_DEFAULT,
816816
};
817-
use crate::testing::trace::{new_test_export_span_data, InMemorySpanExporterBuilder};
817+
use crate::testing::trace::new_test_export_span_data;
818818
use crate::trace::span_processor::{
819819
OTEL_BSP_EXPORT_TIMEOUT_DEFAULT, OTEL_BSP_MAX_CONCURRENT_EXPORTS,
820820
OTEL_BSP_MAX_CONCURRENT_EXPORTS_DEFAULT, OTEL_BSP_MAX_EXPORT_BATCH_SIZE_DEFAULT,
821821
};
822+
use crate::trace::InMemorySpanExporterBuilder;
822823
use crate::trace::{BatchConfig, BatchConfigBuilder, SpanEvents, SpanLinks};
823824
use crate::trace::{ExportResult, SpanData, SpanExporter};
824825
use opentelemetry::trace::{SpanContext, SpanId, SpanKind, Status};

opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -421,14 +421,12 @@ mod tests {
421421
// cargo test trace::span_processor::tests:: --features=testing
422422
use super::{BatchSpanProcessor, SpanProcessor};
423423
use crate::runtime;
424-
use crate::testing::trace::{
425-
new_test_export_span_data, new_tokio_test_exporter, InMemorySpanExporterBuilder,
426-
};
424+
use crate::testing::trace::{new_test_export_span_data, new_tokio_test_exporter};
427425
use crate::trace::span_processor::{
428426
OTEL_BSP_EXPORT_TIMEOUT, OTEL_BSP_MAX_EXPORT_BATCH_SIZE, OTEL_BSP_MAX_QUEUE_SIZE,
429427
OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT, OTEL_BSP_SCHEDULE_DELAY, OTEL_BSP_SCHEDULE_DELAY_DEFAULT,
430428
};
431-
use crate::trace::{BatchConfig, BatchConfigBuilder};
429+
use crate::trace::{BatchConfig, BatchConfigBuilder, InMemorySpanExporterBuilder};
432430
use crate::trace::{ExportResult, SpanData, SpanExporter};
433431
use futures_util::Future;
434432
use std::fmt::Debug;

0 commit comments

Comments
 (0)