Skip to content

Commit 6a8db83

Browse files
authored
Move Metric inmemory exporter (#2548)
1 parent 6a13678 commit 6a8db83

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

opentelemetry-sdk/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,11 @@ limit.
286286
before:
287287
`opentelemetry_sdk::testing::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`
288288
`opentelemetry_sdk::testing::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder};`
289+
`opentelemetry_sdk::testing::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};`
289290
now:
290291
`opentelemetry_sdk::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`
291292
`opentelemetry_sdk::trace::{InMemorySpanExporter, InMemorySpanExporterBuilder};`
293+
`opentelemetry_sdk::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};`
292294

293295
## 0.27.1
294296

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use std::sync::{Arc, Mutex};
2727
///# use opentelemetry_sdk::metrics;
2828
///# use opentelemetry::{KeyValue};
2929
///# use opentelemetry::metrics::MeterProvider;
30-
///# use opentelemetry_sdk::testing::metrics::InMemoryMetricExporter;
30+
///# use opentelemetry_sdk::metrics::InMemoryMetricExporter;
3131
///# use opentelemetry_sdk::metrics::PeriodicReader;
3232
///
3333
///# #[tokio::main]
@@ -86,7 +86,7 @@ impl Default for InMemoryMetricExporter {
8686
/// # Example
8787
///
8888
/// ```
89-
/// # use opentelemetry_sdk::testing::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
89+
/// # use opentelemetry_sdk::metrics::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
9090
///
9191
/// let exporter = InMemoryMetricExporterBuilder::new().build();
9292
/// ```
@@ -138,7 +138,7 @@ impl InMemoryMetricExporter {
138138
/// # Example
139139
///
140140
/// ```
141-
/// # use opentelemetry_sdk::testing::metrics::InMemoryMetricExporter;
141+
/// # use opentelemetry_sdk::metrics::InMemoryMetricExporter;
142142
///
143143
/// let exporter = InMemoryMetricExporter::default();
144144
/// let finished_metrics = exporter.get_finished_metrics().unwrap();
@@ -155,7 +155,7 @@ impl InMemoryMetricExporter {
155155
/// # Example
156156
///
157157
/// ```
158-
/// # use opentelemetry_sdk::testing::metrics::InMemoryMetricExporter;
158+
/// # use opentelemetry_sdk::metrics::InMemoryMetricExporter;
159159
///
160160
/// let exporter = InMemoryMetricExporter::default();
161161
/// exporter.reset();

opentelemetry-sdk/src/metrics/mod.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ pub(crate) mod pipeline;
5757
pub mod reader;
5858
pub(crate) mod view;
5959

60+
/// In-Memory metric exporter for testing purpose.
61+
#[cfg(any(feature = "testing", test))]
62+
#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
63+
pub mod in_memory_exporter;
64+
#[cfg(any(feature = "testing", test))]
65+
#[cfg_attr(docsrs, doc(cfg(any(feature = "testing", test))))]
66+
pub use in_memory_exporter::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
67+
6068
pub use aggregation::*;
6169
pub use error::{MetricError, MetricResult};
6270
pub use manual_reader::*;
@@ -107,8 +115,8 @@ mod tests {
107115
use super::*;
108116
use crate::metrics::data::Aggregation;
109117
use crate::metrics::data::ResourceMetrics;
110-
use crate::testing::metrics::InMemoryMetricExporter;
111-
use crate::testing::metrics::InMemoryMetricExporterBuilder;
118+
use crate::metrics::InMemoryMetricExporter;
119+
use crate::metrics::InMemoryMetricExporterBuilder;
112120
use data::Gauge;
113121
use data::GaugeDataPoint;
114122
use data::Histogram;

opentelemetry-sdk/src/metrics/periodic_reader.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -468,11 +468,11 @@ impl MetricReader for PeriodicReader {
468468
mod tests {
469469
use super::PeriodicReader;
470470
use crate::{
471+
metrics::InMemoryMetricExporter,
471472
metrics::{
472473
data::ResourceMetrics, exporter::PushMetricExporter, reader::MetricReader, MetricError,
473474
MetricResult, SdkMeterProvider, Temporality,
474475
},
475-
testing::metrics::InMemoryMetricExporter,
476476
Resource,
477477
};
478478
use async_trait::async_trait;

opentelemetry-sdk/src/metrics/periodic_reader_with_async_runtime.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ mod tests {
416416
use crate::metrics::reader::MetricReader;
417417
use crate::metrics::MetricError;
418418
use crate::{
419-
metrics::data::ResourceMetrics, metrics::SdkMeterProvider, runtime,
420-
testing::metrics::InMemoryMetricExporter, Resource,
419+
metrics::data::ResourceMetrics, metrics::InMemoryMetricExporter, metrics::SdkMeterProvider,
420+
runtime, Resource,
421421
};
422422
use opentelemetry::metrics::MeterProvider;
423423
use std::sync::mpsc;
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
//! In-Memory metrics exporter for testing purpose.
2-
3-
/// The `in_memory_exporter` module provides in-memory metrics exporter.
4-
/// For detailed usage and examples, see `in_memory_exporter`.
5-
pub mod in_memory_exporter;
6-
pub use in_memory_exporter::{InMemoryMetricExporter, InMemoryMetricExporterBuilder};
7-
1+
//! Structs for tests.
82
#[doc(hidden)]
93
pub mod metric_reader;
104
pub use metric_reader::TestMetricReader;

0 commit comments

Comments
 (0)